diff --git a/Hlt/Hlt2Conf/CMakeLists.txt b/Hlt/Hlt2Conf/CMakeLists.txt
index ddb6f7570f3843e8a262c6f6ba97c56cffa6ee05..ab88127e20c7a503def90e3d86159b95745804bd 100644
--- a/Hlt/Hlt2Conf/CMakeLists.txt
+++ b/Hlt/Hlt2Conf/CMakeLists.txt
@@ -17,7 +17,7 @@ gaudi_install(PYTHON)
 
 gaudi_add_tests(pytest ${CMAKE_CURRENT_SOURCE_DIR}/python)
 foreach(tgt IN ITEMS Gaudi_MergeConfdb LHCb_MergeConfdb Lbcom_MergeConfdb Rec_MergeConfdb Allen_MergeConfdb GaudiKernelDict GaudiPythonDict DAQEventDict)
-    if(TARGET ${tgt}_MergeConfdb)
+    if(TARGET ${tgt})
         add_dependencies(pytest-prefetch-Hlt2Conf-Hlt2Conf.pytest.python ${tgt})
     endif()
 endforeach()
diff --git a/Hlt/Moore/python/Moore/tests/test_lines.py b/Hlt/Moore/python/Moore/tests/test_lines.py
index a71d18a13c5c71cf7c1d8b3da07c23123a65650d..b500ccaae25bff805f945bcaba27d276449881bd 100644
--- a/Hlt/Moore/python/Moore/tests/test_lines.py
+++ b/Hlt/Moore/python/Moore/tests/test_lines.py
@@ -13,7 +13,7 @@
 from Moore import options
 from Moore.lines import Hlt2Line
 from Moore.persistence.particle_moving import particle_output
-from PyConf.Algorithms import Gaudi__Examples__IntDataProducer as IntDataProducer
+from PyConf.Algorithms import Gaudi__TestSuite__IntDataProducer as IntDataProducer
 from PyConf.application import configure_input
 from PyConf.packing import persistreco_version
 
diff --git a/Hlt/Moore/tests/options/minimal_options.py b/Hlt/Moore/tests/options/minimal_options.py
index bb5fcff70001f34a62cadbda0ede782a8e277935..87b6262e4d072eabae24180759060ffbf053379d 100644
--- a/Hlt/Moore/tests/options/minimal_options.py
+++ b/Hlt/Moore/tests/options/minimal_options.py
@@ -20,7 +20,7 @@ This comprises
 
 from Moore import options, run_moore
 from Moore.lines import Hlt1Line
-from PyConf.Algorithms import Gaudi__Examples__IntDataProducer as IntDataProducer
+from PyConf.Algorithms import Gaudi__TestSuite__IntDataProducer as IntDataProducer
 
 
 def lines():