diff --git a/DaVinciTests/tests/options/DaVinci-1000events.py b/DaVinciTests/tests/options/DaVinci-1000events.py
index 435315e01614abcecea88f42ecd0812163dc8ef1..bfb6d312a1cbab4e9bab8ec6b4ea2bc94ff813a8 100644
--- a/DaVinciTests/tests/options/DaVinci-1000events.py
+++ b/DaVinciTests/tests/options/DaVinci-1000events.py
@@ -4,10 +4,3 @@ from Configurables import DaVinci
 # Number of events etc.
 DaVinci().EvtMax    = 1000
 DaVinci().PrintFreq = 10
-
-#DaVinci().SkipEvents = 17100
-
-# Temporary. Force a particular CondDB tag
-#from Configurables import LHCbApp
-#LHCbApp().DDDBtag="head-20120413"
-#LHCbApp().CondDBtag="cond-20131028"
diff --git a/DaVinciTests/tests/options/InputData_Reco17_Run198660.py b/DaVinciTests/tests/options/InputData_Reco17_Run198660.py
new file mode 100644
index 0000000000000000000000000000000000000000..f4e2a1888e5ff64a3f6944fa313add521c056213
--- /dev/null
+++ b/DaVinciTests/tests/options/InputData_Reco17_Run198660.py
@@ -0,0 +1,8 @@
+# File previously defined in
+# $STRIPPINGSELECTIONSROOT/tests/data/Reco17_Run198660.py
+# Now stored in CERN-SWTEST
+
+from Configurables import DaVinci
+from PRConfig import TestFileDB
+
+TestFileDB.test_file_db["2017_DaVinciTests.stripping29r2_collision17_reco17"].run(configurable=DaVinci())
diff --git a/DaVinciTests/tests/qmtest/stripping.qms/test_stripping29r2_collision17_reco17.qmt b/DaVinciTests/tests/qmtest/stripping.qms/test_stripping29r2_collision17_reco17.qmt
index ae0b55a88bf2f6485de8f0b08db5cc2b92e6006a..8e90f0f23d84def21f64427a5aa51bb159e303b9 100755
--- a/DaVinciTests/tests/qmtest/stripping.qms/test_stripping29r2_collision17_reco17.qmt
+++ b/DaVinciTests/tests/qmtest/stripping.qms/test_stripping29r2_collision17_reco17.qmt
@@ -6,8 +6,8 @@
 <argument name="args"><set>
   <text>-T</text>
   <text>$APPCONFIGOPTS/DaVinci/DV-Stripping29r2-Stripping.py</text>
-  <text>$APPCONFIGOPTS/DaVinci/DataType-2017.py</text> 
-  <text>$STRIPPINGSELECTIONSROOT/tests/data/Reco17_Run198660.py</text> 
+  <text>$APPCONFIGOPTS/DaVinci/DataType-2017.py</text>
+  <text>$DAVINCITESTSROOT/tests/options/InputData_Reco17_Run198660.py</text> 
   <text>$APPCONFIGOPTS/Persistency/Compression-ZLIB-1.py</text>
   <text>$APPCONFIGOPTS/DaVinci/InputType-RDST.py</text>
   <text>$APPCONFIGOPTS/DaVinci/DV-RawEventJuggler-0_3-to-4_2.py</text>