diff --git a/TestPolicy/TestPolicy/CppUnit_SGtestdriver.cxx b/AtlasTest/TestTools/TestTools/CppUnit_SGtestdriver.cxx
old mode 100755
new mode 100644
similarity index 100%
rename from TestPolicy/TestPolicy/CppUnit_SGtestdriver.cxx
rename to AtlasTest/TestTools/TestTools/CppUnit_SGtestdriver.cxx
diff --git a/TestPolicy/TestPolicy/CppUnit_testdriver.cxx b/AtlasTest/TestTools/TestTools/CppUnit_testdriver.cxx
old mode 100755
new mode 100644
similarity index 100%
rename from TestPolicy/TestPolicy/CppUnit_testdriver.cxx
rename to AtlasTest/TestTools/TestTools/CppUnit_testdriver.cxx
diff --git a/TestPolicy/CMakeLists.txt b/TestPolicy/CMakeLists.txt
deleted file mode 100644
index 336c995f8c577354c2eec697d261a223bad654ff..0000000000000000000000000000000000000000
--- a/TestPolicy/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################################################
-# Package: TestPolicy
-################################################################################
-
-# Declare the package name:
-atlas_subdir( TestPolicy )
-
-# Install files from the package:
-atlas_install_headers( TestPolicy )
-
diff --git a/docs/doxyfile b/docs/doxyfile
index 9176712234f785f77508fbaf9303f92544e8d16e..8c9b45e2126fe28752405bb1643af4ae1a73fec9 100644
--- a/docs/doxyfile
+++ b/docs/doxyfile
@@ -771,7 +771,7 @@ WARN_LOGFILE           = doxygen_warnings.log
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = README.md AtlasGeometryCommon AtlasTest Calorimeter Commission Control DataQuality Database DetectorDescription Event External ForwardDetectors Generators InnerDetector LumiBlock MagneticField MuonSpectrometer PhysicsAnalysis Projects Reconstruction Simulation TestBeam TestPolicy TileCalorimeter Tools Tracking graphics 
+INPUT                  = README.md AtlasGeometryCommon AtlasTest Calorimeter Commission Control DataQuality Database DetectorDescription Event External ForwardDetectors Generators InnerDetector LumiBlock MagneticField MuonSpectrometer PhysicsAnalysis Projects Reconstruction Simulation TestBeam TileCalorimeter Tools Tracking graphics 
 INPUT += Trigger HLT
 
 # This tag can be used to specify the character encoding of the source files