diff --git a/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py b/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py
index b352b20492dd308c87eeb968b1e291df86caee6d..90c10530d4e6b80c89b1a979f1d5b0ae1a0924d5 100644
--- a/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py
+++ b/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py
@@ -1,6 +1,5 @@
 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/qmtest/upgrade.qms/configure_dst.qmt b/DaVinciTests/tests/qmtest/upgrade.qms/configure_dst.qmt
index 438dff3cf160042329370631d8755204a20ea40b..c57d06b77cf451af7c2053b42eeddbf862e6f84a 100644
--- a/DaVinciTests/tests/qmtest/upgrade.qms/configure_dst.qmt
+++ b/DaVinciTests/tests/qmtest/upgrade.qms/configure_dst.qmt
@@ -3,9 +3,12 @@
 <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>
+      <text>-o</text>
+      <text>configuration_dst.py</text>
+      <text>$DAVINCITESTSROOT/tests/options/Upgrade/DaVinci-Options.py</text>
+      <text>$DAVINCITESTSROOT/tests/options/Upgrade/Input-DST.py</text>
+      <text>$DAVINCITESTSROOT/tests/options/Upgrade/Upgrade-DB-tags.py</text>
   </set></argument>
+  <argument name="use_temp_dir"><enumeral>true</enumeral></argument>
 </extension>
 
diff --git a/DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt b/DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt
index ec8f8c2e2153f4b341632ba47401f279d29a45a3..ae3160df478af5eb3bdb261f39bb4f545415d877 100644
--- a/DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt
+++ b/DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt
@@ -3,9 +3,12 @@
 <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>
+      <text>-o</text>
+      <text>configuration_mdst.py</text>
+      <text>$DAVINCITESTSROOT/tests/options/Upgrade/DaVinci-Options.py</text>
+      <text>$DAVINCITESTSROOT/tests/options/Upgrade/Input-MDST.py</text>
+      <text>$DAVINCITESTSROOT/tests/options/Upgrade/Upgrade-DB-tags.py</text>
   </set></argument>
+  <argument name="use_temp_dir"><enumeral>true</enumeral></argument>
 </extension>