diff --git a/Phys/SelPy/tests/qmtest/selpy.qms/test_configurabloids.qmt b/Phys/SelPy/tests/qmtest/selpy.qms/test_configurabloids.qmt
index 4b1da56b2fb382486880cbf22ea57b3628b8418a..019db0514bf23e48afda196a1cb135e7b6f04571 100644
--- a/Phys/SelPy/tests/qmtest/selpy.qms/test_configurabloids.qmt
+++ b/Phys/SelPy/tests/qmtest/selpy.qms/test_configurabloids.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>../test_configurabloids.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_configurabloids.py</text>
       <text>--verbose</text>
     </set>
   </argument>
diff --git a/Phys/SelPy/tests/qmtest/selpy.qms/test_eventselection.qmt b/Phys/SelPy/tests/qmtest/selpy.qms/test_eventselection.qmt
index 8ca2d26d590ea9656c78c92266103569255d6d79..c59371ff4314473130e35203bac96787a3aca874 100644
--- a/Phys/SelPy/tests/qmtest/selpy.qms/test_eventselection.qmt
+++ b/Phys/SelPy/tests/qmtest/selpy.qms/test_eventselection.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>../test_eventselection.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_eventselection.py</text>
       <text>--verbose</text>
     </set>
   </argument>
diff --git a/Phys/SelPy/tests/qmtest/selpy.qms/test_passthroughselection.qmt b/Phys/SelPy/tests/qmtest/selpy.qms/test_passthroughselection.qmt
index 01a4255265184f960e2a43ed33a09f3931d8e72d..e830df9fa527c106fa40df788d28d4228c4f2687 100644
--- a/Phys/SelPy/tests/qmtest/selpy.qms/test_passthroughselection.qmt
+++ b/Phys/SelPy/tests/qmtest/selpy.qms/test_passthroughselection.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>../test_passthroughselection.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_passthroughselection.py</text>
       <text>--verbose</text>
     </set>
   </argument>
diff --git a/Phys/SelPy/tests/qmtest/selpy.qms/test_selection.qmt b/Phys/SelPy/tests/qmtest/selpy.qms/test_selection.qmt
index aa0077edbb169d85a10f1366870c9afdc7c1dd60..b1ffe784e2f866e505c84cdef27bb9ce27b5098e 100644
--- a/Phys/SelPy/tests/qmtest/selpy.qms/test_selection.qmt
+++ b/Phys/SelPy/tests/qmtest/selpy.qms/test_selection.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>../test_selection.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_selection.py</text>
       <text>--verbose</text>
     </set>
   </argument>
diff --git a/Phys/SelPy/tests/qmtest/selpy.qms/test_selection_components.qmt b/Phys/SelPy/tests/qmtest/selpy.qms/test_selection_components.qmt
index e2126cfd456b7f75d1b02c0ea0bea7ff25f33d4a..02127fe2c6ddebc0a7428f7523fd6411c889907a 100644
--- a/Phys/SelPy/tests/qmtest/selpy.qms/test_selection_components.qmt
+++ b/Phys/SelPy/tests/qmtest/selpy.qms/test_selection_components.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>../test_selection_components.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_selection_components.py</text>
       <text>--verbose</text>
     </set>
   </argument>
diff --git a/PhysSel/PhysSelPython/python/PhysSelPython/Wrappers.py b/PhysSel/PhysSelPython/python/PhysSelPython/Wrappers.py
index fc9da4d0dacaf57994e9f4eb8c75eef96c5482f9..328fab94c1dc4adbf1b78f0108929a937cc01c92 100644
--- a/PhysSel/PhysSelPython/python/PhysSelPython/Wrappers.py
+++ b/PhysSel/PhysSelPython/python/PhysSelPython/Wrappers.py
@@ -63,7 +63,6 @@ from SelPy.selection import EventSelection as EvtSel
 from SelPy.selection import PassThroughSelection as PassThroughSel
 from SelPy.selection import AutomaticData as autodata
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from GaudiConfUtils import configurableExists, isConfigurable
 from GaudiConfUtils import ConfigurableGenerators
 import Configurables
@@ -156,6 +155,7 @@ class AutomaticData(NamedObject, SelectionBase) :
         NamedObject.__init__(self,
                              Location.replace('/', '_'))
 
+        from Configurables import LoKi__VoidFilter as VoidFilter
         _alg = VoidFilter('SelFilter'+self.name(),
                           Code = "CONTAINS('"+Location+"')>0")
 
@@ -200,6 +200,8 @@ class VoidEventSelection(UniquelyNamedObject,
         _code = Code.replace('<Location>',
                              "'"+RequiredSelection.outputLocation()+"'")
         _code = _code.replace('\"\'', '\'').replace('\'\"', '\'').replace('\'\'','\'')
+
+        from Configurables import LoKi__VoidFilter as VoidFilter
         _alg = VoidFilter(self.name(), Code = _code)
 
         SelectionBase.__init__(self,
diff --git a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers.qmt b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers.qmt
index dd9f86a21d790f61ee5e1bc7a845aa4e2f4dc6bb..d7a99fe929c11bb2501ee12c2910e1549d502d6e 100644
--- a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers.qmt
+++ b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>../test_import_wrappers.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_import_wrappers.py</text>
       <text>--verbose</text>
     </set>
   </argument>
diff --git a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers_star.qmt b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers_star.qmt
index c7512e9e406937af3c714b2b8425f0f862ef125d..d642d3a01a7b1a238ba1bbd89a64f620d38b851c 100644
--- a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers_star.qmt
+++ b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers_star.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>$PHYSSELPYTHONROOT/tests/test_import_wrappers_star.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>$PHYSSELPYTHONROOT/tests/test_import_wrappers_star.py</text>
       <text>--verbose</text>
     </set>
   </argument>
diff --git a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_multi_selection_sequence.qmt b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_multi_selection_sequence.qmt
index 6a95a35a94af43fbcfa2beb6673c5693ce7458d7..670623861400bf12f427a482e7c8ced002dc96ab 100644
--- a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_multi_selection_sequence.qmt
+++ b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_multi_selection_sequence.qmt
@@ -12,10 +12,9 @@
 <!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>py.test</text>
+    <text>../test_multi_selection_sequence.py</text>
   </argument>
   <argument name="args"><set>
-    <text>../test_multi_selection_sequence.py</text>
     <text>--verbose</text>
   </set>
   </argument>
diff --git a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection.qmt b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection.qmt
index aa0077edbb169d85a10f1366870c9afdc7c1dd60..b1ffe784e2f866e505c84cdef27bb9ce27b5098e 100644
--- a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection.qmt
+++ b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>../test_selection.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_selection.py</text>
       <text>--verbose</text>
     </set>
   </argument>
diff --git a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection_sequence.qmt b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection_sequence.qmt
index 046862686c4a91a4f925e3d5fb7514bdc22dd5ee..2fcf3f9c4ffb40f81724b6655dc4a05439862129 100644
--- a/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection_sequence.qmt
+++ b/PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection_sequence.qmt
@@ -12,11 +12,10 @@
 <!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>py.test</text>
+    <text>../test_selection_sequence.py</text>
   </argument>
   <argument name="args">
     <set>
-       <text>../test_selection_sequence.py</text>
        <text>--verbose</text>
     </set>
   </argument>