diff --git a/AtlasTest/ControlTest/CMakeLists.txt b/AtlasTest/ControlTest/CMakeLists.txt
index 6ecda92b9fed8d412a8de9e63efd637c98f4809d..d6bd2217ab493060df2952f08b9f0e688344babd 100644
--- a/AtlasTest/ControlTest/CMakeLists.txt
+++ b/AtlasTest/ControlTest/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs(
    Control/AthenaExamples/AthExFortranAlgorithm
    Control/AthenaExamples/AthExStoreGateExample
    Control/AthenaPython
-   TestPolicy
    PRIVATE
    Control/AthContainers
    Control/AthLinks
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
index 983950c19217d0144f36496538456df0387c7b3d..de5c3546a8e579ae286762390634d489f29ae480 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt
@@ -21,8 +21,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Event/ByteStreamCnvSvc
                           Event/ByteStreamData
                           Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # External dependencies:
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
index da51d35236391199fa1008c2219cc3d2c8eee2c0..be0b9a0791912685c628ede8decf75baa3f72f7f 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
@@ -28,7 +28,6 @@ atlas_depends_on_subdirs( PRIVATE
                           InnerDetector/InDetRecEvent/InDetPrepRawData
                           InnerDetector/InDetRecEvent/InDetRIO_OnTrack
                           LArCalorimeter/LArRecEvent
-                          TestPolicy
                           Tracking/TrkDetDescr/TrkSurfaces
                           Tracking/TrkEvent/TrkCompetingRIOsOnTrack
                           Tracking/TrkEvent/TrkEventPrimitives
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt b/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
index 75a626b9e5de5524b97771d0ff3f1972cc7bc9ca..3b2e883044480ad7b90bde3a97be8c45253b0ec0 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
                           Control/StoreGate
                           GaudiKernel
-                          TestPolicy
                           PRIVATE
                           Database/AthenaPOOL/AthenaPoolUtilities
                           Database/RegistrationServices
diff --git a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/CMakeLists.txt b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/CMakeLists.txt
index d23dd615acf62009a4f99619f8c82af3383c3161..4d8687ad8975f385b7fb2d3d8ef3ae7d851c90d0 100644
--- a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/CMakeLists.txt
@@ -8,9 +8,7 @@ atlas_subdir( POOLCollectionToolsTest )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Database/AthenaPOOL/AtlasCollectionTools
-                          Event/ByteStreamCnvSvc
-                          PRIVATE
-                          TestPolicy )
+                          Event/ByteStreamCnvSvc )
 
 # Install files from the package:
 atlas_install_runtime( share/*.py test/POOLCollectionToolsTest_TestConfiguration.xml data/*logCheck* )
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/CMakeLists.txt b/AtlasTest/DatabaseTest/TagCollectionTest/CMakeLists.txt
index 65d89bbd49564b3982ff9fd64dd47a3b04532e85..2d605376829e69deddac26b45a2f6f47d346fbaf 100644
--- a/AtlasTest/DatabaseTest/TagCollectionTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/CMakeLists.txt
@@ -8,7 +8,6 @@ atlas_subdir( TagCollectionTest )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/MinimalRunTime
-                          TestPolicy
                         )
 
 # Install files from the package:
diff --git a/AtlasTest/GoogleTestTools/CMakeLists.txt b/AtlasTest/GoogleTestTools/CMakeLists.txt
index e4d794c715d90672e24706b020ae788b9ff12ba2..f67739b77ba00a7eb5a788ccdeec7239423e7526 100644
--- a/AtlasTest/GoogleTestTools/CMakeLists.txt
+++ b/AtlasTest/GoogleTestTools/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_subdir( GoogleTestTools )
 atlas_depends_on_subdirs(
   PUBLIC
   Control/AthenaCommon
-  TestPolicy
   PRIVATE
   GaudiKernel )
 
diff --git a/AtlasTest/PyAthenaTests/CMakeLists.txt b/AtlasTest/PyAthenaTests/CMakeLists.txt
index 41fa44ff4307f436e75b1c16d4c4cd751121d69a..f03389e3b583488b9ce53fc3f88c3612f372910c 100644
--- a/AtlasTest/PyAthenaTests/CMakeLists.txt
+++ b/AtlasTest/PyAthenaTests/CMakeLists.txt
@@ -8,9 +8,7 @@ atlas_subdir( PyAthenaTests )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaExamples/AthExThinning
-                          Control/AthenaPython
-                          PRIVATE
-                          TestPolicy )
+                          Control/AthenaPython )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/AtlasTest/TestTools/CMakeLists.txt b/AtlasTest/TestTools/CMakeLists.txt
index 6e5009a34b284100a7d2858ce6e3e91023e539f1..dcf64c8a4c8f3d1f4a90ff7a7c75750dd7be2477 100644
--- a/AtlasTest/TestTools/CMakeLists.txt
+++ b/AtlasTest/TestTools/CMakeLists.txt
@@ -7,8 +7,6 @@ atlas_subdir( TestTools )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs(
-   PUBLIC
-   TestPolicy
    PRIVATE
    GaudiKernel )
 
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
index 0abcbeaaa76d7dc989df50183322ea592820a08a..9bec7ae15bba9bd9390e3cfb0bea5d791992e050 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
@@ -20,7 +20,6 @@ atlas_depends_on_subdirs( PUBLIC
                           DetectorDescription/GeoModel/GeoModelInterfaces
                           DetectorDescription/GeoModel/GeoModelUtilities
                           LArCalorimeter/LArGeoModel/LArReadoutGeometry
-                          TestPolicy
                           TileCalorimeter/TileDetDescr )
 
 # External dependencies:
diff --git a/Calorimeter/CaloConditions/CMakeLists.txt b/Calorimeter/CaloConditions/CMakeLists.txt
index 8c9dc9f981c5c3b71c6f0975a05ddc71189e7652..b3fe9fc40dc1ac151e1b34b6c7c18792bb471d43 100644
--- a/Calorimeter/CaloConditions/CMakeLists.txt
+++ b/Calorimeter/CaloConditions/CMakeLists.txt
@@ -14,8 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
 			  Calorimeter/CaloIdentifier
                           GaudiKernel
                           PRIVATE
-                          AtlasTest/TestTools
-                          TestPolicy )
+                          AtlasTest/TestTools )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
diff --git a/Calorimeter/CaloDetDescr/CMakeLists.txt b/Calorimeter/CaloDetDescr/CMakeLists.txt
index 6598037436b82b64eacd6b0216059abb699ca0b8..5438063d9562517f6e341d195b61101610ec12d0 100644
--- a/Calorimeter/CaloDetDescr/CMakeLists.txt
+++ b/Calorimeter/CaloDetDescr/CMakeLists.txt
@@ -20,8 +20,7 @@ atlas_depends_on_subdirs( PUBLIC
                           AtlasTest/TestTools
                           Calorimeter/CaloConditions
                           Calorimeter/CaloGeoHelpers
-                          Control/StoreGate
-                          TestPolicy )
+                          Control/StoreGate )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
diff --git a/Calorimeter/CaloExample/CaloAnaEx/CMakeLists.txt b/Calorimeter/CaloExample/CaloAnaEx/CMakeLists.txt
index eb6decfd974eeef336f7c0a6c021fc6ee8180860..61c60afac921899492ff99c9b6cb2b63afc96a11 100644
--- a/Calorimeter/CaloExample/CaloAnaEx/CMakeLists.txt
+++ b/Calorimeter/CaloExample/CaloAnaEx/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( CaloAnaEx )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/CaloAnaEx_TestConfiguration.xml share/*.C share/*.css share/HistoComparison.txt share/*Checks.py )
diff --git a/Calorimeter/CaloExample/CaloDigEx/CMakeLists.txt b/Calorimeter/CaloExample/CaloDigEx/CMakeLists.txt
index a48d017889c99774fc7556717b6f053a259c0877..913452b02b2bf96bbf04c4a9b4bf03cba65c14e2 100644
--- a/Calorimeter/CaloExample/CaloDigEx/CMakeLists.txt
+++ b/Calorimeter/CaloExample/CaloDigEx/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( CaloDigEx )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/CaloDigEx_TestConfiguration.xml )
diff --git a/Calorimeter/CaloExample/CaloRecEx/CMakeLists.txt b/Calorimeter/CaloExample/CaloRecEx/CMakeLists.txt
index cd97ac872eb512503258777a0b1683eac061b8b6..e05ed3d12ed9235bd56cb84fe8ff7247e8405495 100644
--- a/Calorimeter/CaloExample/CaloRecEx/CMakeLists.txt
+++ b/Calorimeter/CaloExample/CaloRecEx/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( CaloRecEx )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/CaloRecEx_TestConfiguration.xml share/*.C share/*.css share/CaloRecEx_HistoComparison.txt share/*Checks.py )
diff --git a/Calorimeter/CaloExample/CaloSimEx/CMakeLists.txt b/Calorimeter/CaloExample/CaloSimEx/CMakeLists.txt
index 45a2758242c37798761366bdca019f6f19d5951a..85aba200b316062f485f72f5f1de389d13ecdfc5 100644
--- a/Calorimeter/CaloExample/CaloSimEx/CMakeLists.txt
+++ b/Calorimeter/CaloExample/CaloSimEx/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( CaloSimEx )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/CaloSimEx_TestConfiguration.xml )
diff --git a/Calorimeter/CaloExample/CaloTests/CMakeLists.txt b/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
index d477094197fd5638308bbde3628eb2a1eea40338..56901b01727a45293a5ff95bc7628d7a6abec969 100644
--- a/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
+++ b/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
@@ -25,8 +25,7 @@ atlas_depends_on_subdirs( PUBLIC
                           LArCalorimeter/LArRawEvent
                           LArCalorimeter/LArRawUtils
                           LArCalorimeter/LArSimEvent
-                          LArCalorimeter/LArCabling
-                          TestPolicy )
+                          LArCalorimeter/LArCabling )
 
 # External dependencies:
 find_package( AIDA )
diff --git a/Calorimeter/CaloRec/CMakeLists.txt b/Calorimeter/CaloRec/CMakeLists.txt
index 6d960c7c3f6ec6cea8b365ce12f6f678a2a31b5f..0f817811a5d83529fbefd7f6040e63b3aaedaaa0 100644
--- a/Calorimeter/CaloRec/CMakeLists.txt
+++ b/Calorimeter/CaloRec/CMakeLists.txt
@@ -37,8 +37,7 @@ atlas_depends_on_subdirs(
    LArCalorimeter/LArRawConditions
    LumiBlock/LumiBlockComps
    Trigger/TrigAnalysis/TrigAnalysisInterfaces	
-   Control/AthenaMonitoring
-   TestPolicy )
+   Control/AthenaMonitoring )
 
 # External dependencies:
 find_package( AIDA )
diff --git a/Calorimeter/CaloTestBeam/CaloTBRec/CMakeLists.txt b/Calorimeter/CaloTestBeam/CaloTBRec/CMakeLists.txt
index 78c6502ff6d71f22beb0b408db0847533f129e88..e7909fab32d1b7ca0bc47e1464541a0a9f6af0d0 100644
--- a/Calorimeter/CaloTestBeam/CaloTBRec/CMakeLists.txt
+++ b/Calorimeter/CaloTestBeam/CaloTBRec/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( CaloTBRec )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 
diff --git a/Calorimeter/CaloTrackUtils/CMakeLists.txt b/Calorimeter/CaloTrackUtils/CMakeLists.txt
index 0196db4ddf4f3b676f4d2d15b66fee8700607dc9..3ce63604af145f938dabe5c2d93e39dfd476a808 100644
--- a/Calorimeter/CaloTrackUtils/CMakeLists.txt
+++ b/Calorimeter/CaloTrackUtils/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs( PUBLIC
                           DetectorDescription/GeoPrimitives
                           Event/xAOD/xAODCaloEvent
                           Reconstruction/Particle
-                          TestPolicy
                           Tracking/TrkDetDescr/TrkSurfaces
                           Tracking/TrkEvent/TrkParameters
                           Tracking/TrkEvent/TrkParticleBase
diff --git a/Control/AthenaCommon/CMakeLists.txt b/Control/AthenaCommon/CMakeLists.txt
index cf0c271d87eb51c931c3a97f34f10f438b613694..b63f5864704166f55ec17ca93a357a35f2aedcd7 100644
--- a/Control/AthenaCommon/CMakeLists.txt
+++ b/Control/AthenaCommon/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( AthenaCommon )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # External dependencies:
 find_package( six )
 
diff --git a/Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt b/Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt
index bb494193d5e4d3533764e1fd6a0cbfc9de915b66..d48708fdea2b1bff398c8155daafd59e18cb95b4 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt
+++ b/Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt
@@ -18,8 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthAnalysisBaseComps
                           Control/AthToolSupport/AsgTools
                           Event/xAOD/xAODJet
-                          AtlasTest/GoogleTestTools
-                          TestPolicy )
+                          AtlasTest/GoogleTestTools )
 
 # Libraries in the package:
 atlas_add_library( AthAsgExUnittestLib
diff --git a/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt b/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
index b66d2017468dbd8d0d344bf5da260590360f711c..1a5981b61d399a3de08aa5f782b7bb8c61eedb58 100644
--- a/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
@@ -10,8 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           Control/AthenaBaseComps
-			  Control/AthenaConfiguration
-                          TestPolicy )
+			                    Control/AthenaConfiguration )
 
 # Component(s) in the package:
 atlas_add_component( AthExHelloWorld
diff --git a/Control/AthenaExamples/AthExMonitored/CMakeLists.txt b/Control/AthenaExamples/AthExMonitored/CMakeLists.txt
index c02cd88d1797700dc4060d3a303a744cdd56f2bd..0b7df1df2d8215c583874975d0bc1608eb1e5253 100644
--- a/Control/AthenaExamples/AthExMonitored/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExMonitored/CMakeLists.txt
@@ -10,8 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           Control/AthenaBaseComps
-                          Control/AthenaMonitoring
-                          TestPolicy )
+                          Control/AthenaMonitoring )
 
 # Component(s) in the package:
 atlas_add_component( AthExMonitored
diff --git a/Control/AthenaExamples/AthExUnittest/CMakeLists.txt b/Control/AthenaExamples/AthExUnittest/CMakeLists.txt
index 997246c41654446e4622797d81f7a398945a5b56..17e031707b6333b6eca12ec90d4c8d2c2234d329 100644
--- a/Control/AthenaExamples/AthExUnittest/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExUnittest/CMakeLists.txt
@@ -15,8 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
 			  Control/AthenaBaseComps
-                          AtlasTest/GoogleTestTools
-                          TestPolicy )
+                          AtlasTest/GoogleTestTools )
 
 # The component lib:
 atlas_add_component( AthExUnittest
diff --git a/Control/DataModelTest/DataModelRunTests/CMakeLists.txt b/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
index 95a9668155aa875f59e788caeb81be728a2b6aca..4cbd577d1223869429709f837a78478244e650eb 100644
--- a/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( DataModelRunTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 
diff --git a/Control/PerformanceMonitoring/PerfMonVTune/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonVTune/CMakeLists.txt
index 2becf9fc535081d93d64a6f4f12e5542b1dcbd4f..32458edab35600ed2ccfa3a2baa962f7fd1dd391 100644
--- a/Control/PerformanceMonitoring/PerfMonVTune/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonVTune/CMakeLists.txt
@@ -10,8 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          TestPolicy )
+                          Control/AthenaKernel )
 
 ####
 # VTune hack for the time-being
diff --git a/Database/APR/RelationalCollection/CMakeLists.txt b/Database/APR/RelationalCollection/CMakeLists.txt
index 956ca4cf3f15217238930887918b7f5be4de0487..1c0b704086f97305b2b6f4cc20ebb131e0127417 100644
--- a/Database/APR/RelationalCollection/CMakeLists.txt
+++ b/Database/APR/RelationalCollection/CMakeLists.txt
@@ -10,8 +10,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Database/APR/CollectionBase
                           Database/APR/POOLCore
                           Database/PersistentDataModel
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # External dependencies:
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/CMakeLists.txt
index c75ffe57c880b76991555a0650de10761a82edd4..56cbec088617de3d47582b4f3299d9a35fcca834 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/CMakeLists.txt
@@ -17,8 +17,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Event/ByteStreamData
                           Event/EventBookkeeperMetaData
                           Event/EventInfo
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # Component(s) in the package:
 atlas_add_component( AthenaPoolExampleAlgorithms
diff --git a/Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt
index 8a258bcdcee1244634fd9fd5a6113d5dbf2c5e30..1ebe4fe84f871bad095ad555e71ac8d4a39cf606 100644
--- a/Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolTools/CMakeLists.txt
@@ -15,8 +15,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Event/ByteStreamData
                           Event/xAOD/xAODEventInfo
                           Event/xAOD/xAODCutFlow
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # Component(s) in the package:
 atlas_add_component( AthenaPoolTools
diff --git a/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt b/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
index 5a90092bfdd48fbc082d0d24c77f0fd5f7d680d4..b4d9a4c596c67b716595f935b0f25b48c3887707 100644
--- a/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
+++ b/Database/AthenaPOOL/AtlasCollectionTools/CMakeLists.txt
@@ -11,8 +11,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Database/APR/CollectionBase
                           Database/APR/CollectionUtilities
                           Database/APR/PersistencySvc
-                          Database/APR/StorageSvc
-                          TestPolicy )
+                          Database/APR/StorageSvc )
 
 # Necessary external(s):
 find_package( cx_Oracle )
diff --git a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
index 184c94f596f3a186a46ae8035f48e0aa356593eb..bab9069410a6392736f035b8bff3c3522b143aeb 100644
--- a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
+++ b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
@@ -25,7 +25,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/EventInfo
 			  Event/xAOD/xAODEventInfo
                           GaudiKernel
-                          TestPolicy 
 			  Control/xAODRootAccess)
 
 # External dependencies:
diff --git a/Event/ByteStreamTest/CMakeLists.txt b/Event/ByteStreamTest/CMakeLists.txt
index da75687d31584ce1ed9f5aa8da999f9b842fd526..5ca9e9ca4e0540f6bd2a0a5f314942111c9caa91 100644
--- a/Event/ByteStreamTest/CMakeLists.txt
+++ b/Event/ByteStreamTest/CMakeLists.txt
@@ -14,8 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Database/AthenaPOOL/AthenaPoolUtilities
                           Event/ByteStreamCnvSvc
                           Event/ByteStreamData
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # Component(s) in the package:
 atlas_add_component( ByteStreamTest
diff --git a/Event/FourMom/CMakeLists.txt b/Event/FourMom/CMakeLists.txt
index a253ab39ad564fb12b2717752d1f0e536463362b..fe670f90168ba96203a46ce5a1f0507b18af7db9 100644
--- a/Event/FourMom/CMakeLists.txt
+++ b/Event/FourMom/CMakeLists.txt
@@ -9,10 +9,9 @@ atlas_subdir( FourMom )
 atlas_depends_on_subdirs( PUBLIC
                           Event/EventKernel
                           Event/EventPrimitives
-			  Control/CxxUtils
+                          Control/CxxUtils
                           PRIVATE
-                          AtlasTest/TestTools
-                          TestPolicy )
+                          AtlasTest/TestTools )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
diff --git a/Event/xAOD/xAODCaloEventCnv/CMakeLists.txt b/Event/xAOD/xAODCaloEventCnv/CMakeLists.txt
index 5a7b55027659daaa131656cbfd23fd5b5d045f5c..59e1c7cc4b6cad16ecb571421709f6dd4bfd641c 100644
--- a/Event/xAOD/xAODCaloEventCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODCaloEventCnv/CMakeLists.txt
@@ -14,8 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           Control/AthenaKernel
                           Event/EventKernel
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/ForwardDetectors/LUCID/LUCID_RawEvent/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_RawEvent/CMakeLists.txt
index 178529238a02d2b23f852c9cd903c2f276aea168..e283db0004c160e5d4f3b2b93b152078703720c6 100644
--- a/ForwardDetectors/LUCID/LUCID_RawEvent/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_RawEvent/CMakeLists.txt
@@ -8,9 +8,7 @@ atlas_subdir( LUCID_RawEvent )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
-                          Control/AthContainers
-                          PRIVATE
-                          TestPolicy )
+                          Control/AthContainers )
 
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Generators/EvgenJobTransforms/CMakeLists.txt b/Generators/EvgenJobTransforms/CMakeLists.txt
index 35dd11e373b28d1138a43f5cbdb3081a4c7ba3f9..6b76ce6dd839895d6cfa4bd2905d7fe6c2184984 100644
--- a/Generators/EvgenJobTransforms/CMakeLists.txt
+++ b/Generators/EvgenJobTransforms/CMakeLists.txt
@@ -8,9 +8,7 @@ atlas_subdir( EvgenJobTransforms )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Tools/PyJobTransforms
-                          PRIVATE
-                          TestPolicy )
+                          Tools/PyJobTransforms )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
index 9f6ebe45cd4e06366c3628161d96b6ac1a9106ed..2ffc5237b11e70cea07c4172d1581d8429548b79 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
@@ -35,7 +35,6 @@ atlas_depends_on_subdirs( PUBLIC
   InnerDetector/InDetDetDescr/InDetIdentifier
   InnerDetector/InDetDetDescr/InDetReadoutGeometry
   InnerDetector/InDetDetDescr/PixelCabling
-  TestPolicy
   Tools/PathResolver
   ${extra_dep} )
 
diff --git a/InnerDetector/InDetExample/InDetAlignExample/CMakeLists.txt b/InnerDetector/InDetExample/InDetAlignExample/CMakeLists.txt
index b9e8eee27f5887b4cf87b26735d9bfd3ec1ae382..0ea8406d7061d981a356d229ab5691b2f2381844 100644
--- a/InnerDetector/InDetExample/InDetAlignExample/CMakeLists.txt
+++ b/InnerDetector/InDetExample/InDetAlignExample/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( InDetAlignExample )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py share/InDetAlignExampleFlags/*.py share/Data/*.txt )
diff --git a/InnerDetector/InDetExample/InDetRecExample/CMakeLists.txt b/InnerDetector/InDetExample/InDetRecExample/CMakeLists.txt
index 29fb60266c2d7dbc6211ca3383389c24fb0d16ec..0de54acbaa075e0b27b95c31a715fbd38f9c186e 100644
--- a/InnerDetector/InDetExample/InDetRecExample/CMakeLists.txt
+++ b/InnerDetector/InDetExample/InDetRecExample/CMakeLists.txt
@@ -8,8 +8,7 @@ atlas_subdir( InDetRecExample )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PRIVATE
                           Control/AthenaCommon
-                          Database/RDBAccessSvc
-                          TestPolicy )
+                          Database/RDBAccessSvc )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/CMakeLists.txt b/InnerDetector/InDetExample/InDetSLHC_Example/CMakeLists.txt
index ede481a27daba95fb05bbbc6757875e9b64cc8ce..16b09c443a115938c62097d5a9094f5bbb6475d3 100644
--- a/InnerDetector/InDetExample/InDetSLHC_Example/CMakeLists.txt
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/CMakeLists.txt
@@ -8,8 +8,7 @@ atlas_subdir( InDetSLHC_Example )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PRIVATE
                           Control/AthenaCommon
-                          Database/RDBAccessSvc
-                          TestPolicy )
+                          Database/RDBAccessSvc )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/CMakeLists.txt b/InnerDetector/InDetExample/InDetTrigRecExample/CMakeLists.txt
index 559a3de9feb3bee29588d3de008dbc85a30649e7..96888349ef46abad46f384203a7741f27cf6f971 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/CMakeLists.txt
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( InDetTrigRecExample )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/**.py )
diff --git a/InnerDetector/InDetMonitoring/InDetMonitoringATN/CMakeLists.txt b/InnerDetector/InDetMonitoring/InDetMonitoringATN/CMakeLists.txt
index 71d470b8ae73e731adcfd5011faa1329915c23c0..b9dfb443a73bd5cbcf4c959cc551eedfd0ad21d2 100644
--- a/InnerDetector/InDetMonitoring/InDetMonitoringATN/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/InDetMonitoringATN/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( InDetMonitoringATN )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/jobOptions_monitoring.py test/InDetMonitoringATN_Subdetector.sh )
diff --git a/InnerDetector/InDetValidation/InDetAlignmentMonitoringRTT/CMakeLists.txt b/InnerDetector/InDetValidation/InDetAlignmentMonitoringRTT/CMakeLists.txt
index 85229f9120815ab4cffbcc0f0d8f0434fa6ce7d2..86fa7461f9ed9a3f42b7f859a4ee46a8146e3398 100644
--- a/InnerDetector/InDetValidation/InDetAlignmentMonitoringRTT/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetAlignmentMonitoringRTT/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( InDetAlignmentMonitoringRTT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/InDetAlignmentMonitoringRTT_TestConfiguration.xml )
diff --git a/InnerDetector/InDetValidation/InDetExperimentalReco/CMakeLists.txt b/InnerDetector/InDetValidation/InDetExperimentalReco/CMakeLists.txt
index 9830c0ff18222cbc6f853a833aa2a2e1980bb87f..f9a9ccf735ff2cb724e5bbfb480fec44dfb26e7c 100644
--- a/InnerDetector/InDetValidation/InDetExperimentalReco/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetExperimentalReco/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( InDetExperimentalReco )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 
diff --git a/InnerDetector/InDetValidation/InDetFullChainTests/CMakeLists.txt b/InnerDetector/InDetValidation/InDetFullChainTests/CMakeLists.txt
index 8fbc7dbb75a1115cdf17722b94f3f38e53f0ee07..73485e2ec047af3f1f24bdd1287b433b855708a5 100644
--- a/InnerDetector/InDetValidation/InDetFullChainTests/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetFullChainTests/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( InDetFullChainTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 
diff --git a/InnerDetector/InDetValidation/InDetGeometryValidation/CMakeLists.txt b/InnerDetector/InDetValidation/InDetGeometryValidation/CMakeLists.txt
index 638fe1453e6d2ccda9790365c73284e964705ead..011ba8cf8d7de8b27504ee40b89b893ec92aa628 100644
--- a/InnerDetector/InDetValidation/InDetGeometryValidation/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetGeometryValidation/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( InDetGeometryValidation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/*.py )
diff --git a/InnerDetector/InDetValidation/InDetPerformanceMonitoringRTT/CMakeLists.txt b/InnerDetector/InDetValidation/InDetPerformanceMonitoringRTT/CMakeLists.txt
index b1f0239d134f3986541127c30ef5b88dcc0322aa..675d47589b2b9a2aac6e399b7a91341fcc14783c 100644
--- a/InnerDetector/InDetValidation/InDetPerformanceMonitoringRTT/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetPerformanceMonitoringRTT/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( InDetPerformanceMonitoringRTT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/InDetPerformanceMonitoringRTT_TestConfiguration.xml )
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/CMakeLists.txt b/InnerDetector/InDetValidation/InDetPerformanceRTT/CMakeLists.txt
index ea767bf706e5d30704c30a7454c7d14050b61ae3..c689387483e5a2c9a4168d56932790e1a9d501cd 100644
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Generators/GeneratorObjects
                           InnerDetector/InDetDetDescr/InDetIdentifier
                           InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          TestPolicy
                           Tracking/TrkEvent/TrkTrack
                           Tracking/TrkTools/TrkToolInterfaces
                           PRIVATE
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/CMakeLists.txt b/LArCalorimeter/LArExample/LArCalibProcessing/CMakeLists.txt
index 3f324752e57f42ddfd9c585b9cb66e641f4a8dfa..92fdab3744b9fed02fcc82a2690e7ea360c611b8 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/CMakeLists.txt
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArCalibProcessing )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Necessary external(s):
 find_package( cx_Oracle )
 
diff --git a/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
index 65709689123bab667f5b704e2ba6d82238cf2093..6f418370040f881b69ba68c163d16dd477665662 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
@@ -17,8 +17,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Generators/GeneratorObjects
                           LArCalorimeter/LArSimEvent
                           MagneticField/MagFieldInterfaces
-                          Reconstruction/egamma/egammaEvent
-                          TestPolicy )
+                          Reconstruction/egamma/egammaEvent )
 
 # External dependencies:
 find_package( CLHEP )
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
index b469e64fb826700d5e52cc219dfadfdbd48e4490..bc33be62cf651b6ab6ee999b8abd73841e77c20b 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
@@ -18,7 +18,6 @@ atlas_depends_on_subdirs( PUBLIC
                           LArCalorimeter/LArRawConditions
                           LArCalorimeter/LArRawUtils
                           LArCalorimeter/LArTools
-                          TestPolicy
                           PRIVATE
                           Calorimeter/CaloDetDescr
                           Calorimeter/CaloEvent
diff --git a/LArCalorimeter/LArTestBeam/LArTBRec/CMakeLists.txt b/LArCalorimeter/LArTestBeam/LArTBRec/CMakeLists.txt
index c4f509547cd6211af657d4d0d16cc4778c06d3ff..69751eb3da0b34fedeae8c63a2ee85dad27e0ffd 100644
--- a/LArCalorimeter/LArTestBeam/LArTBRec/CMakeLists.txt
+++ b/LArCalorimeter/LArTestBeam/LArTBRec/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArTBRec )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/CMakeLists.txt b/MuonSpectrometer/MuonAlignment/MuonAlignExample/CMakeLists.txt
index 1c7aade465a6d825e77ac0d5a045310babc5038b..3dc534182868612b8b76c0a4e1286077ec029e51 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/CMakeLists.txt
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonAlignExample )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/CMakeLists.txt b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/CMakeLists.txt
index 38c19ec38f83cd12cbee566c03a2618abe2c948e..3ba3f4e4cd8cb665e4d711b344fb7bc6a3c113d3 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/CMakeLists.txt
@@ -8,7 +8,6 @@ atlas_subdir( CscCalibAlgs )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/MinimalRunTime
-                          TestPolicy
                           PRIVATE
                           Control/AthenaBaseComps
                           Control/AthContainers
diff --git a/MuonSpectrometer/MuonCnv/MuonCnvExample/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonCnvExample/CMakeLists.txt
index 868f3b1c9802611eaf26407495efa2a33726693f..a67290f4def96ed8cfaa5b2e1a6dccd14dcc2917 100644
--- a/MuonSpectrometer/MuonCnv/MuonCnvExample/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonCnvExample/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCnvExample )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
index 3cc15e0ec86b38cc63c4716b3dde816d30e9a888..20a86166c89b4d11153d7198a665194e3d2aa595 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/StoreGate
                           GaudiKernel
                           MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData
-                          TestPolicy
                           PRIVATE
                           Control/AthenaKernel
                           MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
index ed580cf9f910e9b26d71cab25c4a9c181624793a..39dd4e7db68f37f27cf086a6370a904fb2795139 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
@@ -11,8 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
                           MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc
-			  MuonSpectrometer/​MuonDetDescr/MuonReadoutGeometry
-                          TestPolicy
+			  MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
                           PRIVATE
                           DetectorDescription/Identifier )
 
diff --git a/MuonSpectrometer/MuonDigitContainer/CMakeLists.txt b/MuonSpectrometer/MuonDigitContainer/CMakeLists.txt
index 17344721d59cc30b4ae98b943b04e29cca76c03a..d2d8e4848619618e76275358583ebc147489c4eb 100644
--- a/MuonSpectrometer/MuonDigitContainer/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitContainer/CMakeLists.txt
@@ -11,9 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthContainers
                           DetectorDescription/Identifier
                           Event/EventContainers
-                          MuonSpectrometer/MuonIdHelpers
-                          PRIVATE
-                          TestPolicy )
+                          MuonSpectrometer/MuonIdHelpers )
 
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/CMakeLists.txt
index 42ca292b2d06003495ed093958c4b48d95864ab5..b4c0254a9a419a3117b7eec85cfae8269ff23c61 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/CMakeLists.txt
@@ -16,7 +16,6 @@ atlas_depends_on_subdirs( PUBLIC
                           MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
                           MuonSpectrometer/MuonIdHelpers
                           MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
-                          TestPolicy
                           Tracking/TrkDetDescr/TrkSurfaces
                           Tracking/TrkEvent/TrkEventPrimitives
                           Tracking/TrkEvent/TrkRIO_OnTrack )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/CMakeLists.txt
index 3ce6a064ce2a6f470633b821e2b7036ee4682fd4..776b6869b21231aa869d67de1f94d4367fd35f40 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/CMakeLists.txt
@@ -13,8 +13,8 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           Event/EventPrimitives
                           MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers
-                          TestPolicy )
+                          MuonSpectrometer/MuonIdHelpers )
+
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Matrix)
 
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/CMakeLists.txt
index 0bda3006659c9210de099f1aea22b6ac9f3aaa6e..fffc555287d0db155bcd0ec63529a3b51d3248a7 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PUBLIC
                           MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
                           MuonSpectrometer/MuonDigitContainer
                           MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
-                          TestPolicy
                           PRIVATE
                           MuonSpectrometer/MuonIdHelpers )
 
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/CMakeLists.txt
index 05f293dc25a3d75993a1f5e40a6c1fafff27bf10..750022e85493c95771adfe085cdbdec9b273f3e2 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/STgcClusterization/CMakeLists.txt
@@ -13,8 +13,8 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           Event/EventPrimitives
                           MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers
-                          TestPolicy )
+                          MuonSpectrometer/MuonIdHelpers )
+
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonFlags/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonFlags/CMakeLists.txt
index 32d2e7ea0fa8e60b3fc0784c6cd7a6ce59d17a88..b971f6215f470a8420869adeb650009d6ca05edd 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonFlags/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonFlags/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonDQAMonFlags )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt
index 21c57527d89793e81b77073db9d9c2d3c8d1ff1e..5cbff42d5a386533f751b0415386a8525af92c8a 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs( PUBLIC
                           PRIVATE
                           DataQuality/DataQualityInterfaces
                           Event/EventInfo
-                          TestPolicy
                           Trigger/TrigT1/TrigT1Result )
 
 # External dependencies:
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/CMakeLists.txt
index 7173d632da977ab23ac37638fa83c09c1abb849c..ef9c7c80122697f7749f0e0f5ce1c8260a5fba9a 100644
--- a/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonGeomRTT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/CMakeLists.txt
index 5de382262cd5504407bdd1628a0b5f6dc05c1760..cf718bbe7bde3a848696544c1024d3d1b67be615 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MooPerformance )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/MooPerformance_TestConfiguration.xml share/*.C share/*.h share/*.py scripts/*.py ExtraFiles/*.html )
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonHolesValidationRTT/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonHolesValidationRTT/CMakeLists.txt
index 4c57e999c7cd3862dea31f30e9028b5dbfcd2375..41c2ec48d2ea772565f640346e70ff1052e90bcc 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonHolesValidationRTT/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonHolesValidationRTT/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonHolesValidationRTT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 #atlas_install_runtime( test/MuonHolesValidationRTT_TestConfiguration.xml )
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/CMakeLists.txt
index 77c46b92900b6d6c8e7d7814ef9b3990a213b1b3..d42f689c2279efd39020daada6743eecea8d4396 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonRecRTT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/D23PDMakerUtils/D23PDValidation/CMakeLists.txt b/PhysicsAnalysis/D23PDMakerUtils/D23PDValidation/CMakeLists.txt
index edefc09a5246291464fa77120cb71f6a0fafb453..5b0c1ac020ec45e86b1af9d73a97bf1ef0a64a1b 100644
--- a/PhysicsAnalysis/D23PDMakerUtils/D23PDValidation/CMakeLists.txt
+++ b/PhysicsAnalysis/D23PDMakerUtils/D23PDValidation/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( D23PDValidation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_runtime( test/D23PDValidation_TestConfiguration.xml )
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
index ce7cd474ccbae34c222adbfb390bcc1b9eeb684d..1c59a569074cd66d64522b2544770357e60a9589 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
@@ -17,8 +17,7 @@ atlas_depends_on_subdirs( PRIVATE
                           GaudiKernel
                           PhysicsAnalysis/AnalysisCommon/ParticleEvent
                           PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
-                          PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
-                          TestPolicy )
+                          PhysicsAnalysis/D3PDMaker/D3PDMakerUtils )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/CMakeLists.txt
index 974ba7e2128bff4b45c582c311a4bb9f49a31b77..7060f2be1803bacab6d44f10cb8d9b2de34eee66 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/CMakeLists.txt
@@ -20,8 +20,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           MuonSpectrometer/MuonSimEvent
                           PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
-                          Simulation/G4Sim/TrackRecord
-                          TestPolicy )
+                          Simulation/G4Sim/TrackRecord )
 
 # External dependencies:
 find_package( CLHEP )
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIInDetValidation/CMakeLists.txt b/PhysicsAnalysis/HeavyIonPhys/HIInDetValidation/CMakeLists.txt
index e0ec26c49fe5e1323247e9132aeba77a1ed31d70..d26b43e199b95ed53ca9f1ac05702881f45e7e07 100644
--- a/PhysicsAnalysis/HeavyIonPhys/HIInDetValidation/CMakeLists.txt
+++ b/PhysicsAnalysis/HeavyIonPhys/HIInDetValidation/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( HIInDetValidation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/HIInDetValidation_TestConfiguration.xml share/HIInDetValidation*.py macros/HIInDetValidation_Eff*.C macros/HIInDetValidation_Fakes*.C macros/HIInDetValidation_CoolDozer.py share/ARTT_Plots.html macros/png_file.png macros/HIInDetValidation_Loose_Vs_Tight.C macros/HIInDetValidation_Vertexing.C share/HIInDetTrkD3PD_jobOptions.py )
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/CMakeLists.txt b/PhysicsAnalysis/PrimaryDPDMaker/CMakeLists.txt
index 103934131262b7c2634838dea1d4b23d8524f424..63eb5c5ef51d5ef1ec8ebc2726f49ce9141dd562 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/PrimaryDPDMaker/CMakeLists.txt
@@ -40,7 +40,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Reconstruction/MuonIdentification/muonEvent
                           Reconstruction/egamma/egammaEvent
                           Reconstruction/tauEvent
-                          TestPolicy
                           TileCalorimeter/TileEvent
                           TileCalorimeter/TileIdentifier
                           Tracking/TrkEvent/TrkParameters
diff --git a/PhysicsAnalysis/PyAnalysis/PyAnalysisUtils/CMakeLists.txt b/PhysicsAnalysis/PyAnalysis/PyAnalysisUtils/CMakeLists.txt
index 2fd763ab2d92c624b65bdccf9ecd872de0d6b190..aca0a23453ad31c8997b7d81963e69ba59724330 100644
--- a/PhysicsAnalysis/PyAnalysis/PyAnalysisUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/PyAnalysis/PyAnalysisUtils/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( PyAnalysisUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleTests/CMakeLists.txt
index cf438c4b145d0b06318cc7f1dc532dd3c545aed1..7500125e16543626e19b5f33cffbfc333ee4d4ee 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/CMakeLists.txt
@@ -17,8 +17,7 @@ atlas_depends_on_subdirs( PRIVATE
                           PhysicsAnalysis/TruthParticleID/McParticleAlgs
                           PhysicsAnalysis/TruthParticleID/McParticleEvent
                           PhysicsAnalysis/TruthParticleID/McParticleKernel
-                          PhysicsAnalysis/TruthParticleID/McParticleUtils
-                          TestPolicy )
+                          PhysicsAnalysis/TruthParticleID/McParticleUtils )
 
 # External dependencies:
 find_package( CLHEP )
diff --git a/Reconstruction/Jet/JetValidation/CMakeLists.txt b/Reconstruction/Jet/JetValidation/CMakeLists.txt
index bce11cac3fcf0ea6e9c81f5c6569b5ed0a09a847..e0362e04f5f846e0089fa0fca1b4cec49f7e48fc 100644
--- a/Reconstruction/Jet/JetValidation/CMakeLists.txt
+++ b/Reconstruction/Jet/JetValidation/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( JetValidation )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PRIVATE
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Reconstruction/MuonIdentification/MuGirlPerformance/CMakeLists.txt b/Reconstruction/MuonIdentification/MuGirlPerformance/CMakeLists.txt
index ec938ac50131638c7d40a51a61ff82e3c339bb36..cf9abf58a3a5179235e284f13081a0b1bf370076 100644
--- a/Reconstruction/MuonIdentification/MuGirlPerformance/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuGirlPerformance/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuGirlPerformance )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 #atlas_install_runtime( test/MuGirlPerformance_TestConfiguration.xml share/*.C share/*.h )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/CMakeLists.txt b/Reconstruction/MuonIdentification/MuonCombinedRecExample/CMakeLists.txt
index a38f9e27c178256004a90972df350e974cf32c22..821537cb7e1684069992433cb915c3db58a9cf90 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCombinedRecExample )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedValidation/MuonCombinedRecRTT/CMakeLists.txt b/Reconstruction/MuonIdentification/MuonCombinedValidation/MuonCombinedRecRTT/CMakeLists.txt
index f738232823c8ffce0f2084fa5a21f1fac1145727..bf98b88d5f89c9bfec299ca8a37942efb114b9af 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedValidation/MuonCombinedRecRTT/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuonCombinedValidation/MuonCombinedRecRTT/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCombinedRecRTT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/Reconstruction/MuonIdentification/MuonCombinedValidation/MuonRecConfigTests/CMakeLists.txt b/Reconstruction/MuonIdentification/MuonCombinedValidation/MuonRecConfigTests/CMakeLists.txt
index 3a80994b37061686ff7f9abd36e08142e76cc60b..750eb5498d60526fdf9bc5dfa9f343e885af40ba 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedValidation/MuonRecConfigTests/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuonCombinedValidation/MuonRecConfigTests/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonRecConfigTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 #atlas_install_runtime( test/MuonRecConfigTests_TestConfiguration.xml share/*.py )
diff --git a/Reconstruction/RecExample/RecExAnaTest/CMakeLists.txt b/Reconstruction/RecExample/RecExAnaTest/CMakeLists.txt
index ac3b8ca83312b8500fbfec365e8038deacbe1013..2746823d4fb66e8c01542926e32c1a442ea0780b 100644
--- a/Reconstruction/RecExample/RecExAnaTest/CMakeLists.txt
+++ b/Reconstruction/RecExample/RecExAnaTest/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( RecExAnaTest )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/RecExAnaTest_TestConfiguration.xml share/run_memleak_reat.sh )
diff --git a/Reconstruction/RecExample/RecExCommission/CMakeLists.txt b/Reconstruction/RecExample/RecExCommission/CMakeLists.txt
index 168d626d300a6d70f78011488ba6d4aceec67a47..a2b2d4f2ba5666f617cdc40861e4679bcdc72784 100644
--- a/Reconstruction/RecExample/RecExCommission/CMakeLists.txt
+++ b/Reconstruction/RecExample/RecExCommission/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( RecExCommission )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/RecExample/RecExCommon/CMakeLists.txt b/Reconstruction/RecExample/RecExCommon/CMakeLists.txt
index 1dc7d09c747002f36ed8ed7db2d89baa39c9236c..4f9bcb822dfadb3f5354411c1b0ac3201ae2de96 100644
--- a/Reconstruction/RecExample/RecExCommon/CMakeLists.txt
+++ b/Reconstruction/RecExample/RecExCommon/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( RecExCommon )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/RecExample/RecExRecoTest/CMakeLists.txt b/Reconstruction/RecExample/RecExRecoTest/CMakeLists.txt
index 7fb1152ccfeaebb69c4ef9dbedd6f710cd9a3a7a..03e9fb2d0251035e36069f6c831a84f409552b75 100644
--- a/Reconstruction/RecExample/RecExRecoTest/CMakeLists.txt
+++ b/Reconstruction/RecExample/RecExRecoTest/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( RecExRecoTest )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/RecExample/RecExTB/CMakeLists.txt b/Reconstruction/RecExample/RecExTB/CMakeLists.txt
index 716d817636846f14e7bb9ab19d8c5d67df108c07..9891828e4c2dabda2a55e3a523307d214f2c4188 100644
--- a/Reconstruction/RecExample/RecExTB/CMakeLists.txt
+++ b/Reconstruction/RecExample/RecExTB/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( RecExTB )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/Reconstruction/RecExample/RecExTrigTest/CMakeLists.txt b/Reconstruction/RecExample/RecExTrigTest/CMakeLists.txt
index 4983a9c58bfb93763416eeffce4deb84b20d5628..fb549304c6264c182c4b2496d6438590e525402c 100644
--- a/Reconstruction/RecExample/RecExTrigTest/CMakeLists.txt
+++ b/Reconstruction/RecExample/RecExTrigTest/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( RecExTrigTest )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/RecExTrigTest_TestConfiguration.xml share/run_memleak_rett.sh )
diff --git a/Reconstruction/RecExample/RecJobTransformTests/CMakeLists.txt b/Reconstruction/RecExample/RecJobTransformTests/CMakeLists.txt
index d6f21b1553d1b39396a715f4c91a557304837bfe..0fa76cc66464951be287b5a726f162ec43418230 100644
--- a/Reconstruction/RecExample/RecJobTransformTests/CMakeLists.txt
+++ b/Reconstruction/RecExample/RecJobTransformTests/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( RecJobTransformTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_runtime( test/RecJobTransformTests_TestConfiguration.xml share/compressRTTLogFiles_rjtt.sh share/run_memleak_rjtt.sh )
 
diff --git a/Reconstruction/RecExample/RecPerfTests/CMakeLists.txt b/Reconstruction/RecExample/RecPerfTests/CMakeLists.txt
index 57da1f201f4fcbb193e275b461f5351bb9092487..98edc112e2526f762d9932d75f50bab51ca2b520 100644
--- a/Reconstruction/RecExample/RecPerfTests/CMakeLists.txt
+++ b/Reconstruction/RecExample/RecPerfTests/CMakeLists.txt
@@ -5,9 +5,5 @@
 # Declare the package name:
 atlas_subdir( RecPerfTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_runtime( test/RecPerfTests_TestConfiguration.xml )
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/CMakeLists.txt b/Reconstruction/RecoAlgs/CaloRingerAlgs/CMakeLists.txt
index b06f0ea51e948cdd236719f408d81baab3bf93b4..92d16943339ae40cd44af94035b853cd86559069 100644
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/CMakeLists.txt
+++ b/Reconstruction/RecoAlgs/CaloRingerAlgs/CMakeLists.txt
@@ -17,8 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/xAOD/xAODBase
                           Event/xAOD/xAODCaloRings
                           Event/xAOD/xAODCore
-                          Reconstruction/RecoTools/CaloRingerTools
-                          TestPolicy )
+                          Reconstruction/RecoTools/CaloRingerTools )
 
 # Component(s) in the package:
 atlas_add_component( CaloRingerAlgs
diff --git a/Reconstruction/egamma/egammaPerformance/CMakeLists.txt b/Reconstruction/egamma/egammaPerformance/CMakeLists.txt
index f028024956c5a122e77b1c598098626c24cc05fa..c1fb31975b963a88be30bbd80569738a7e1401b5 100644
--- a/Reconstruction/egamma/egammaPerformance/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaPerformance/CMakeLists.txt
@@ -15,9 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           Trigger/TrigAnalysis/TrigDecisionTool
                           Trigger/TrigEvent/TrigParticle
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          PRIVATE
-                          TestPolicy )
+                          Trigger/TrigEvent/TrigSteeringEvent )
 
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
diff --git a/Reconstruction/egamma/egammaValidation/CMakeLists.txt b/Reconstruction/egamma/egammaValidation/CMakeLists.txt
index 2f3d7b4cc5436705b2a78fcc5f24f28cf08c8d1f..986fd16c7401bcd1da72d1ab92742d30da7ee151 100644
--- a/Reconstruction/egamma/egammaValidation/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaValidation/CMakeLists.txt
@@ -20,7 +20,6 @@ atlas_depends_on_subdirs( PRIVATE
         PhysicsAnalysis/AnalysisCommon/PATCore
 	PhysicsAnalysis/MCTruthClassifier
 	PhysicsAnalysis/IsolationSelection
-	TestPolicy 
 	Tracking/TrkValidation/TrkValHistUtils ) 
 
 # add the Module/component library :
diff --git a/Simulation/Digitization/CMakeLists.txt b/Simulation/Digitization/CMakeLists.txt
index ee4ea973019901f56cd21035285ea5e03cb494b1..c4e77419dea6944e043932fd8b6366bc73f10f4d 100644
--- a/Simulation/Digitization/CMakeLists.txt
+++ b/Simulation/Digitization/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py
                               POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/FastSimulation/FastChainPileup/CMakeLists.txt b/Simulation/FastSimulation/FastChainPileup/CMakeLists.txt
index a2faf1b568bc31b4d62df043ad582d71b57187eb..27d35d423bd84e57f431a5fd749f976a63fa1220 100644
--- a/Simulation/FastSimulation/FastChainPileup/CMakeLists.txt
+++ b/Simulation/FastSimulation/FastChainPileup/CMakeLists.txt
@@ -9,9 +9,7 @@ atlas_subdir( FastChainPileup )
 atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           Generators/GeneratorModules
-                          Generators/Pythia8_i
-                          PRIVATE
-                          TestPolicy )
+                          Generators/Pythia8_i )
 
 # External dependencies:
 find_package( CLHEP )
diff --git a/Simulation/FastSimulation/FastSimulationTests/CMakeLists.txt b/Simulation/FastSimulation/FastSimulationTests/CMakeLists.txt
index 21e009471840967a570caf66d1add4c5750cef79..b00fc398fce826e399fb253e71ccaee2362e9dac 100644
--- a/Simulation/FastSimulation/FastSimulationTests/CMakeLists.txt
+++ b/Simulation/FastSimulation/FastSimulationTests/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastSimulationTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
index 171ed997fab4ae5109dc87ad8dc3df780cdbe57b..e49db9253e1ce4eca1e0e05a84f8cbeb58a963b6 100644
--- a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
@@ -34,7 +34,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Simulation/G4Sim/MCTruth
                           Simulation/G4Sim/TrackRecord
                           Simulation/HitManagement
-                          TestPolicy
                           TileCalorimeter/TileDetDescr
                           TileCalorimeter/TileIdentifier
                           TileCalorimeter/TileSimEvent )
diff --git a/Simulation/ISF/ISF_Config/CMakeLists.txt b/Simulation/ISF/ISF_Config/CMakeLists.txt
index 082a2fe0fd8ca3ea421396dc406dd4dad9b39e96..7ccf83930d89dd7def89f701a137ef83960bccc9 100644
--- a/Simulation/ISF/ISF_Config/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Config/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Config )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 if( NOT SIMULATIONBASE )
    atlas_add_test(test_Sim_tf_configuration
                   SCRIPT test/test_Sim_tf_configuration.py
diff --git a/Simulation/ISF/ISF_Example/CMakeLists.txt b/Simulation/ISF/ISF_Example/CMakeLists.txt
index c3ddb3adfb9e6b3b79f7bb0fd79cb567abc7c621..4cc8cd3a72fd906df2d9e47e0645cf53e4dbcff9 100644
--- a/Simulation/ISF/ISF_Example/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Example/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Example )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/Simulation/ISF/ISF_Validation/CMakeLists.txt b/Simulation/ISF/ISF_Validation/CMakeLists.txt
index 9504397f872c1455deb3cdd2be4064379e01024b..195984c0678b175952dbf441d0026fa2d350ba62 100644
--- a/Simulation/ISF/ISF_Validation/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Validation/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Validation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_runtime( test/ISF_Validation_TestConfiguration.xml )
 atlas_install_scripts( scripts/*.sh test/*.sh )
diff --git a/Simulation/Tests/DigitizationTests/CMakeLists.txt b/Simulation/Tests/DigitizationTests/CMakeLists.txt
index 6ddf1750571fd5bcf29357bc97ae166ac2c2785d..06c3cf0c96bfd795808d9ab8eec7720b6256fbc2 100644
--- a/Simulation/Tests/DigitizationTests/CMakeLists.txt
+++ b/Simulation/Tests/DigitizationTests/CMakeLists.txt
@@ -15,8 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Generators/GeneratorObjects
                           InnerDetector/InDetDetDescr/InDetIdentifier
                           InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetRawEvent/InDetSimData
-                          TestPolicy )
+                          InnerDetector/InDetRawEvent/InDetSimData )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
diff --git a/Simulation/Tests/DigitizationTestsMT/CMakeLists.txt b/Simulation/Tests/DigitizationTestsMT/CMakeLists.txt
index 2a1f4cd87ff61c7567d0690ab01a79ea973ceba2..78fd6b3bff376b6b8616b57b4cb9032f63b015a8 100644
--- a/Simulation/Tests/DigitizationTestsMT/CMakeLists.txt
+++ b/Simulation/Tests/DigitizationTestsMT/CMakeLists.txt
@@ -5,9 +5,5 @@
 # Declare the package name:
 atlas_subdir( DigitizationTestsMT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 atlas_install_scripts( test/*.sh )
 
diff --git a/Simulation/Tests/ISF_ValidationMT/CMakeLists.txt b/Simulation/Tests/ISF_ValidationMT/CMakeLists.txt
index 972bd5e568ea1c6e0ba1590f400b30e2c0f639fd..7aa0c7b3b5de6bf67f2a4025697f88181f680176 100644
--- a/Simulation/Tests/ISF_ValidationMT/CMakeLists.txt
+++ b/Simulation/Tests/ISF_ValidationMT/CMakeLists.txt
@@ -5,9 +5,5 @@
 # Declare the package name:
 atlas_subdir( ISF_ValidationMT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_scripts( test/*.sh )
diff --git a/Simulation/Tests/OverlayTests/CMakeLists.txt b/Simulation/Tests/OverlayTests/CMakeLists.txt
index 52b87612aa02bfbcbc0fb79a2273406cf78c4cc3..9bf2dfbcaa7b0c117255ab906a525af28b52e5d6 100644
--- a/Simulation/Tests/OverlayTests/CMakeLists.txt
+++ b/Simulation/Tests/OverlayTests/CMakeLists.txt
@@ -5,9 +5,5 @@
 # Declare the package name:
 atlas_subdir( OverlayTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_scripts( test/*.sh )
diff --git a/Simulation/Tests/OverlayTestsMT/CMakeLists.txt b/Simulation/Tests/OverlayTestsMT/CMakeLists.txt
index dc400a73c7acf57bb10676af5623b08dd638a241..e156720aac480d979e43200f77ee64da268c7830 100644
--- a/Simulation/Tests/OverlayTestsMT/CMakeLists.txt
+++ b/Simulation/Tests/OverlayTestsMT/CMakeLists.txt
@@ -5,9 +5,5 @@
 # Declare the package name:
 atlas_subdir( OverlayTestsMT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_scripts( test/*.sh )
diff --git a/Simulation/Tests/SimCoreTests/CMakeLists.txt b/Simulation/Tests/SimCoreTests/CMakeLists.txt
index 48c2030a672ad7041c46d84cb314c46b1392d513..e86d8e07591c2b6e17e148c00747911ef6e2088a 100644
--- a/Simulation/Tests/SimCoreTests/CMakeLists.txt
+++ b/Simulation/Tests/SimCoreTests/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( SimCoreTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_runtime( test/SimCoreTests_TestConfiguration.xml )
 atlas_install_scripts( test/*.sh test/*.py )
diff --git a/Simulation/Tests/SimCoreTestsMT/CMakeLists.txt b/Simulation/Tests/SimCoreTestsMT/CMakeLists.txt
index 00eb0b20ffe98c1c43ec6baf6ffb16fcca81cd2e..4ec35f5a3dc17ec566614eb08951bb4c9723edc6 100644
--- a/Simulation/Tests/SimCoreTestsMT/CMakeLists.txt
+++ b/Simulation/Tests/SimCoreTestsMT/CMakeLists.txt
@@ -5,9 +5,5 @@
 # Declare the package name:
 atlas_subdir( SimCoreTestsMT )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_scripts( test/*.sh )
diff --git a/Simulation/Tests/SimExoticsTests/CMakeLists.txt b/Simulation/Tests/SimExoticsTests/CMakeLists.txt
index 8685ad0b27d366ad71a0e63d8155774c1d889701..7ee781ea50dc33440a5ef66a79804e510666b57b 100644
--- a/Simulation/Tests/SimExoticsTests/CMakeLists.txt
+++ b/Simulation/Tests/SimExoticsTests/CMakeLists.txt
@@ -5,9 +5,5 @@
 # Declare the package name:
 atlas_subdir( SimExoticsTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_scripts( test/*.sh )
diff --git a/Simulation/Tests/SimPerformanceTests/CMakeLists.txt b/Simulation/Tests/SimPerformanceTests/CMakeLists.txt
index 607aa3b79609d6b0a147bf17607e8c1b62d66f60..b0a9192f0561c1167bacde6029296b2b8b6be67b 100644
--- a/Simulation/Tests/SimPerformanceTests/CMakeLists.txt
+++ b/Simulation/Tests/SimPerformanceTests/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( SimPerformanceTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/SimPerformanceTests_TestConfiguration.xml )
diff --git a/TileCalorimeter/TileExample/TileRecEx/CMakeLists.txt b/TileCalorimeter/TileExample/TileRecEx/CMakeLists.txt
index aeda00e8c7d53e928dfca1a5b8cc9751a9cc094d..f43b0ce6f41956245fb10107296421f53e33377d 100644
--- a/TileCalorimeter/TileExample/TileRecEx/CMakeLists.txt
+++ b/TileCalorimeter/TileExample/TileRecEx/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( TileRecEx )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/TileRecEx_TestConfiguration.xml share/TileRecEx_*.C share/DoTileOptimalFilteringAlgsRttHistograms.C )
diff --git a/Tools/DirectIOART/CMakeLists.txt b/Tools/DirectIOART/CMakeLists.txt
index b95edcddf22725940234575e2d011a1a86127847..0af36c8291e6ba0718ecfea23c50e597f8e02d44 100644
--- a/Tools/DirectIOART/CMakeLists.txt
+++ b/Tools/DirectIOART/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( DirectIOART  )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_scripts( test/*.sh test/*.py )
 
diff --git a/Tools/Tier0ChainTests/CMakeLists.txt b/Tools/Tier0ChainTests/CMakeLists.txt
index 08a5825678f9d1d45529cf46b044ddf05c962baf..b7b16211490dd416be25ef8c71302053e7cf08b4 100644
--- a/Tools/Tier0ChainTests/CMakeLists.txt
+++ b/Tools/Tier0ChainTests/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( Tier0ChainTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_scripts( scripts/tct_*.py scripts/tct_*.sh )
diff --git a/Tools/ValgrindRTTJobs/CMakeLists.txt b/Tools/ValgrindRTTJobs/CMakeLists.txt
index 2ca25a860b2283819fb753c43b2fd527b6c3ee0b..fd1bf46ee12055001d2aba28640fee5a02c6b2f1 100644
--- a/Tools/ValgrindRTTJobs/CMakeLists.txt
+++ b/Tools/ValgrindRTTJobs/CMakeLists.txt
@@ -9,7 +9,6 @@ atlas_subdir( ValgrindRTTJobs )
 atlas_depends_on_subdirs( PRIVATE
                           Control/AthenaBaseComps
                           GaudiKernel
-                          TestPolicy
                           Tools/PyJobTransformsCore )
 
 # Component(s) in the package:
diff --git a/Tracking/TrkAlignment/TrkAlgebraUtils/CMakeLists.txt b/Tracking/TrkAlignment/TrkAlgebraUtils/CMakeLists.txt
index cb2f982db3fbebf1532a67f81c001c2fbd65de02..2733d2edad35ed68b75d1109dcc0d0bbfd968385 100644
--- a/Tracking/TrkAlignment/TrkAlgebraUtils/CMakeLists.txt
+++ b/Tracking/TrkAlignment/TrkAlgebraUtils/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( TrkAlgebraUtils )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PRIVATE
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # External dependencies:
 find_package( BLAS )
diff --git a/Trigger/TrigMonitoring/TrigCostMonitorMT/CMakeLists.txt b/Trigger/TrigMonitoring/TrigCostMonitorMT/CMakeLists.txt
index ca3bed2bbfe476a0584d5865611cef070d59a047..7371bf87663058ca4fc7de96acaf7ed41c2b48fd 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitorMT/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigCostMonitorMT/CMakeLists.txt
@@ -16,8 +16,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Trigger/TrigTools/TrigTimeAlgs
                           Trigger/TrigConfiguration/TrigConfHLTData
                           Trigger/TrigEvent/TrigSteeringEvent
-                          Event/xAOD/xAODTrigger
-                          TestPolicy )
+                          Event/xAOD/xAODTrigger )
 
 # Component(s) in the package:
 atlas_add_component( TrigCostMonitorMT
diff --git a/Trigger/TrigValidation/TrigEgammaValidation/CMakeLists.txt b/Trigger/TrigValidation/TrigEgammaValidation/CMakeLists.txt
index 2d04e0cbf81589c8209ec9b093721bb243ae7bbf..ae49c59bcec8fabb231ca475b75c357508097f67 100644
--- a/Trigger/TrigValidation/TrigEgammaValidation/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigEgammaValidation/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( TrigEgammaValidation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_docs( doc/Summary-dev/*.php doc/Summary-dev/*.html doc/Summary-dev/content.xml doc/Summary-dev/style.css doc/Summary-dev/*.gif )
 atlas_install_joboptions( share/testAthenaTrigRDOtoAOD_RTT.py share/testNavZeeTPExample.py share/TrigEgammaValidation_RTT_Chains.py )
diff --git a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
index b0c1c1727f9b529a512c6d9214765e7c594e4f6f..6032f1506bd86b840ea50134eb3c26d2bcc47515 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( TrigInDetValidation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # External dependencies:
 find_package( requests )
 
diff --git a/Trigger/TrigValidation/TrigInDetValidationLight/CMakeLists.txt b/Trigger/TrigValidation/TrigInDetValidationLight/CMakeLists.txt
index 3297bde24b9cab71803d0bf0adffa1a306e79517..28a5784654412d9add9871e109d3024d55478066 100644
--- a/Trigger/TrigValidation/TrigInDetValidationLight/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigInDetValidationLight/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( TrigInDetValidationLight )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_runtime( test/TrigInDetValidationLight_TestConfiguration.xml )
 
diff --git a/Trigger/TrigValidation/TrigInDetValidationWeb/CMakeLists.txt b/Trigger/TrigValidation/TrigInDetValidationWeb/CMakeLists.txt
index 04344dd40d4c687a1d108f635286d3fcb0ac62dd..6e5621ebb2d8a3dbaf490dfe786d424d5cafb4be 100644
--- a/Trigger/TrigValidation/TrigInDetValidationWeb/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigInDetValidationWeb/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( TrigInDetValidationWeb )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_runtime( share/TIDAWeb )
 
diff --git a/Trigger/TrigValidation/TrigMuonValidation/CMakeLists.txt b/Trigger/TrigValidation/TrigMuonValidation/CMakeLists.txt
index 5790ea45fe9c37d7d44091bae7428616d61ea116..910af6d07009e55c445f8fb5478c4545a84fd573 100644
--- a/Trigger/TrigValidation/TrigMuonValidation/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigMuonValidation/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( TrigMuonValidation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/TrigMuonValidation_RTT_*.py share/TrigMuonValidation_CreateEfficiencies.py )
 
diff --git a/Trigger/TrigValidation/TrigValAlgs/CMakeLists.txt b/Trigger/TrigValidation/TrigValAlgs/CMakeLists.txt
index 512f791ba31c6e12b2021818cfde870807ae7add..cb3dd798f0ee654aa0049621256cb11f39f50a3f 100644
--- a/Trigger/TrigValidation/TrigValAlgs/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigValAlgs/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           Control/AthAnalysisBaseComps
                           GaudiKernel
-                          TestPolicy
                           Trigger/TrigAnalysis/TrigDecisionTool
                           Trigger/TrigConfiguration/TrigConfInterfaces
                           Trigger/TrigConfiguration/TrigConfHLTData
diff --git a/Trigger/TrigValidation/TriggerTest/CMakeLists.txt b/Trigger/TrigValidation/TriggerTest/CMakeLists.txt
index 1fa30e93b0b1a8b01dd4906b50d6d80db6371878..23ef281f90a2cf63ed76f9aef91d939db99cbcf2 100644
--- a/Trigger/TrigValidation/TriggerTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TriggerTest/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( TriggerTest )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TestPolicy )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/*.cxx Testing/*.conf )
diff --git a/graphics/JiveXML/CMakeLists.txt b/graphics/JiveXML/CMakeLists.txt
index bd9c1ce5569a2eb47735ba28f63bdddf65ccf063..7884c730f3d946baaa7c24fc51eccc2b8ee0d9a5 100644
--- a/graphics/JiveXML/CMakeLists.txt
+++ b/graphics/JiveXML/CMakeLists.txt
@@ -12,8 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/StoreGate
                           Event/EventInfo
                           Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          TestPolicy )
+                          GaudiKernel )
 
 # Component(s) in the package:
 atlas_add_library( JiveXMLLib