diff --git a/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py b/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py
new file mode 100644
index 0000000000000000000000000000000000000000..b352b20492dd308c87eeb968b1e291df86caee6d
--- /dev/null
+++ b/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py
@@ -0,0 +1,6 @@
+from Configurables import DaVinci
+DaVinci().TupleFile = 'DV-Ntuple.root'
+DaVinci().InputType = 'DST'
+DaVinci().DataType = 'Upgrade'
+DaVinci().Lumi = False
+DaVinci().Simulation = True
diff --git a/DaVinciTests/tests/options/Upgrade/Input-DST.py b/DaVinciTests/tests/options/Upgrade/Input-DST.py
new file mode 100644
index 0000000000000000000000000000000000000000..6fe0b085c5569eba2b308f2ac27c3673ef2d136a
--- /dev/null
+++ b/DaVinciTests/tests/options/Upgrade/Input-DST.py
@@ -0,0 +1,2 @@
+from Configurables import DaVinci
+DaVinci().InputType = 'DST'
diff --git a/DaVinciTests/tests/options/Upgrade/Input-MDST.py b/DaVinciTests/tests/options/Upgrade/Input-MDST.py
new file mode 100644
index 0000000000000000000000000000000000000000..f9caeb6e7968c0f9cfcb7a769e1b7dbc607f822f
--- /dev/null
+++ b/DaVinciTests/tests/options/Upgrade/Input-MDST.py
@@ -0,0 +1,2 @@
+from Configurables import DaVinci
+DaVinci().InputType = 'MDST'
diff --git a/DaVinciTests/tests/options/Upgrade/Upgrade-DB-tags.py b/DaVinciTests/tests/options/Upgrade/Upgrade-DB-tags.py
new file mode 100644
index 0000000000000000000000000000000000000000..5de90593ed1239c1982962b29c8d8d3bff424e19
--- /dev/null
+++ b/DaVinciTests/tests/options/Upgrade/Upgrade-DB-tags.py
@@ -0,0 +1,4 @@
+from Configurables import LHCbApp, CondDB
+LHCbApp().DDDBtag = "dddb-20171126"
+LHCbApp().CondDBtag = "sim-20171127-vc-md100"
+CondDB().Upgrade = True
diff --git a/DaVinciTests/tests/qmtest/upgrade.qms/configure_dst.qmt b/DaVinciTests/tests/qmtest/upgrade.qms/configure_dst.qmt
new file mode 100644
index 0000000000000000000000000000000000000000..438dff3cf160042329370631d8755204a20ea40b
--- /dev/null
+++ b/DaVinciTests/tests/qmtest/upgrade.qms/configure_dst.qmt
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+  <argument name="program">   <text>gaudirun.py</text></argument>
+  <argument name="args"><set>
+      <text>../options/Upgrade/DaVinci-Options.py</text>
+      <text>../options/Upgrade/Input-DST.py</text>
+      <text>../options/Upgrade/Upgrade-DB-tags.py</text>
+  </set></argument>
+</extension>
+
diff --git a/DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt b/DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt
new file mode 100644
index 0000000000000000000000000000000000000000..ec8f8c2e2153f4b341632ba47401f279d29a45a3
--- /dev/null
+++ b/DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+  <argument name="program">   <text>gaudirun.py</text></argument>
+  <argument name="args"><set>
+      <text>../options/Upgrade/DaVinci-Options.py</text>
+      <text>../options/Upgrade/Input-MDST.py</text>
+      <text>../options/Upgrade/Upgrade-DB-tags.py</text>
+  </set></argument>
+</extension>
+