diff --git a/GeneratorInterface/RivetInterface/python/rivetAnalyzer_cfi.py b/GeneratorInterface/RivetInterface/python/rivetAnalyzer_cfi.py
index a2ac6cf9a074c..22750da6cc409 100644
--- a/GeneratorInterface/RivetInterface/python/rivetAnalyzer_cfi.py
+++ b/GeneratorInterface/RivetInterface/python/rivetAnalyzer_cfi.py
@@ -12,5 +12,5 @@
   CrossSection = cms.double(-1),
   DoFinalize = cms.bool(True),
   ProduceDQMOutput = cms.bool(False),
-  OutputFile = cms.string('out.aida')
+  OutputFile = cms.string('out.yoda')
 )
diff --git a/GeneratorInterface/RivetInterface/test/BuildFile.xml b/GeneratorInterface/RivetInterface/test/BuildFile.xml
new file mode 100644
index 0000000000000..3236148a4a18c
--- /dev/null
+++ b/GeneratorInterface/RivetInterface/test/BuildFile.xml
@@ -0,0 +1,2 @@
+<test name="test-rivet-list" command="test-rivet-list.sh"/>
+<test name="test-rivet-run" command="test-rivet-run.sh"/>
\ No newline at end of file
diff --git a/GeneratorInterface/RivetInterface/test/rivet_cfg.py b/GeneratorInterface/RivetInterface/test/rivet_cfg.py
index 15afd17402d66..6ddb997628009 100644
--- a/GeneratorInterface/RivetInterface/test/rivet_cfg.py
+++ b/GeneratorInterface/RivetInterface/test/rivet_cfg.py
@@ -22,7 +22,7 @@
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 
 process.maxEvents = cms.untracked.PSet(
-    input = cms.untracked.int32(10000)
+    input = cms.untracked.int32(100)
 )
 
 # Input source
@@ -82,9 +82,11 @@
     )
 )
 
+process.load("GeneratorInterface.RivetInterface.rivetAnalyzer_cfi")
+process.rivetAnalyzer.AnalysisNames = cms.vstring('MC_GENERIC', 'CMS_2013_I1224539_DIJET', 'CMS_2014_I1305624')
 
 # Path and EndPath definitions
-process.generation_step = cms.Path(process.pgen)
+process.generation_step = cms.Path(process.pgen*process.rivetAnalyzer)
 process.genfiltersummary_step = cms.EndPath(process.genFilterSummary)
 process.endjob_step = cms.EndPath(process.endOfProcess)
 process.RAWSIMoutput_step = cms.EndPath(process.RAWSIMoutput)
@@ -93,16 +95,4 @@
 process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.endjob_step,process.RAWSIMoutput_step)
 # filter all path with the production filter sequence
 for path in process.paths:
-	getattr(process,path)._seq = process.generator * getattr(process,path)._seq 
-
-# customisation of the process.
-
-# Automatic addition of the customisation function from Configuration.GenProduction.rivet_customize
-from Configuration.GenProduction.rivet_customize import customise 
-
-#call to customisation function customise imported from Configuration.GenProduction.rivet_customize
-process = customise(process)
-
-# End of customisation functions
-process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2013_I1224539_DIJET')
-process.rivetAnalyzer.OutputFile = cms.string('mcfile.yoda')
+	getattr(process,path)._seq = process.generator * getattr(process,path)._seq 
\ No newline at end of file
diff --git a/GeneratorInterface/RivetInterface/test/test-rivet-list.sh b/GeneratorInterface/RivetInterface/test/test-rivet-list.sh
new file mode 100755
index 0000000000000..b835b99d19eee
--- /dev/null
+++ b/GeneratorInterface/RivetInterface/test/test-rivet-list.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+rivet --list-analyses | grep MC_GENERIC
diff --git a/GeneratorInterface/RivetInterface/test/test-rivet-run.sh b/GeneratorInterface/RivetInterface/test/test-rivet-run.sh
new file mode 100755
index 0000000000000..a7d801e89bdcd
--- /dev/null
+++ b/GeneratorInterface/RivetInterface/test/test-rivet-run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+cmsRun ${CMSSW_BASE}/src/GeneratorInterface/RivetInterface/test/rivet_cfg.py