diff --git a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py
new file mode 100644
index 0000000000000000000000000000000000000000..ce60e09bb5371f03726098975136cd934d805d00
--- /dev/null
+++ b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py
@@ -0,0 +1,82 @@
+"""
+Example Options for BTagging algorithm
+
+@author Marco Musy, Kevin Heinicke
+@date 2010-09-29, 2018-05-03
+"""
+
+from Gaudi.Configuration import *
+import GaudiPython
+from Configurables import GaudiSequencer
+
+# some selections
+
+from Configurables import CheatedSelection, BDecayTool, MCDecayFinder
+
+myDecay = '[B+ -> (J/psi(1S) => mu+ mu- ) K+]cc'
+
+cheatsel = CheatedSelection("CheatedSelection")
+cheatsel.Inputs = [ "Phys/TaggingPions" ]
+cheatsel.AssociatorInputData = [ "Phys/CheatedSelection/Particles" ]
+cheatsel.OutputLevel = 5
+
+cheatsel.addTool( BDecayTool )
+cheatsel.BDecayTool.addTool( MCDecayFinder )
+cheatsel.BDecayTool.MCDecayFinder.Decay = myDecay
+
+
+# setup tagging
+
+location = "Phys/CheatedSelection"
+
+from Configurables import (BTagging, BTaggingTool, BTaggingChecker,
+        BDecayTool, MCDecayFinder)
+from FlavourTagging.Tunings import applyTuning
+
+tag = BTagging("BTagging")
+tag.Inputs = [ location ]
+#tag.OutputLevel = 5
+tag.addTool( BDecayTool )
+tag.BDecayTool.addTool( MCDecayFinder )
+tag.BDecayTool.MCDecayFinder.Decay = myDecay
+tag.addTool( BTaggingTool )
+applyTuning(tag.BTaggingTool, 'Run1')
+tag.BTaggingTool.AssocPVCriterion = 'PVbyIP'  # needed by CheatedSelection
+
+# Flavour tagging Checker
+tagcheck = BTaggingChecker("BTaggingChecker")
+tagcheck.Inputs = [ location ]
+tagcheck.TagsLocation = location+"/FlavourTags"
+#tagcheck.OutputLevel = 1
+tagcheck.addTool( BDecayTool )
+tagcheck.BDecayTool.addTool( MCDecayFinder )
+tagcheck.BDecayTool.MCDecayFinder.Decay = myDecay
+MessageSvc().Format = "% F%40W%S%7W%R%T %0W%M"
+
+
+# standard configuration
+
+from Configurables import DaVinci
+DaVinci().EvtMax     = 1000                       # Number of events
+DaVinci().SkipEvents = 0                          # Events to skip
+DaVinci().PrintFreq  = 100
+DaVinci().DataType = "2012"
+DaVinci().CondDBtag = 'sim-20121025-vc-mu100'
+DaVinci().DDDBtag = "dddb-20120831"
+DaVinci().Simulation    = True
+from Configurables import StoreExplorerAlg, PrintDecayTree
+PrintDecayTree().Inputs = [ location ]
+DaVinci().MoniSequence = [
+        cheatsel,
+        tag,
+        tagcheck,
+        ]  # The algorithms
+
+#from GaudiConf import IOHelper
+#IOHelper().inputFiles(['PFN:root://eoslhcb.cern.ch//eos/lhcb/freezer/lhcb/MC/2012/ALLSTREAMS.DST/00021062/0000/00021062_00000001_1.allstreams.dst']) # Bu2JpsiK
+
+importOptions( '$PRCONFIGOPTS/DaVinci/FlavourTagging/MC12-B2JPsiMuMuK.py' )
+
+appMgr = GaudiPython.AppMgr()
+
+appMgr.run( DaVinci().EvtMax )
diff --git a/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt b/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt
index ace482bf362e8f7c5d76153f248b4d65d7129e73..ec7b4441ae989ebba5bb55341bed94f62295abd8 100644
--- a/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt
+++ b/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt
@@ -4,7 +4,7 @@
 <argument name="program"><text>python</text></argument>
 <argument name="timeout"><integer>3600</integer></argument>
 <argument name="args"><set>
-  <text>../options/Tagging/DVTestTagging-MC12.py</text>
+  <text>../options/Tagging/DVTestTagging-Summer2017Opt-Run1.py</text>
 </set></argument>
 <argument name="validator"><text>
 findReferenceBlock("""