diff --git a/Control/StoreGateTests/CMakeLists.txt b/Control/StoreGateTests/CMakeLists.txt
index 3b9f15dd0b407e4905623061236e838151dbb6e6..cf0da065b32e2075975bd785db5248aa3f565c0b 100644
--- a/Control/StoreGateTests/CMakeLists.txt
+++ b/Control/StoreGateTests/CMakeLists.txt
@@ -8,10 +8,9 @@ atlas_subdir( StoreGateTests )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaPython
-                          Control/CLIDSvc
+                          Control/AthenaKernel
                           Control/AthAllocators
                           Control/AthContainers
-                          Control/SGTools
                           PRIVATE
                           Control/AthenaBaseComps
                           Control/StoreGate
@@ -25,13 +24,13 @@ atlas_add_component( StoreGateTests
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthAllocators AthContainers SGTools AthenaBaseComps StoreGateLib SGtests GaudiKernel )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthAllocators AthContainers AthenaBaseComps StoreGateLib SGtests GaudiKernel )
 
 atlas_add_dictionary( StoreGateTestsDict
                       StoreGateTests/StoreGateTestsDict.h
                       StoreGateTests/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthAllocators AthContainers SGTools AthenaBaseComps StoreGateLib SGtests GaudiKernel )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthAllocators AthContainers AthenaBaseComps StoreGateLib SGtests GaudiKernel )
 
 # Install files from the package:
 atlas_install_headers( StoreGateTests )
diff --git a/Control/StoreGateTests/StoreGateTests/PayLoad.h b/Control/StoreGateTests/StoreGateTests/PayLoad.h
index 485f360d4ad6d6021cc9cf1c4fd172f31a28e76b..ffbbb7b08a8f1ca6412712a22e29febed2840b46 100755
--- a/Control/StoreGateTests/StoreGateTests/PayLoad.h
+++ b/Control/StoreGateTests/StoreGateTests/PayLoad.h
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 namespace SgTests {
   struct PayLoad {