diff --git a/TestBeam/TBCnv/src/TBCheckBCIDs.cxx b/TestBeam/TBCnv/src/TBCheckBCIDs.cxx
index 2c20b8a4f839a2156a1df84d9113369d958285e8..e3df57a427225b3430c2588614edc6eb9b529d5b 100644
--- a/TestBeam/TBCnv/src/TBCheckBCIDs.cxx
+++ b/TestBeam/TBCnv/src/TBCheckBCIDs.cxx
@@ -1,7 +1,7 @@
 //Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -10,7 +10,6 @@
 #include "GaudiKernel/MsgStream.h"
 #include "ByteStreamData/RawEvent.h"
 #include "ByteStreamCnvSvcBase/FullEventAssembler.h" 
-#include "StoreGate/StoreGate.h"
 //#include "CLIDSvc/CLASS_DEF.h"
 #include <map> 
 
diff --git a/TestBeam/TBDetDescrCnv/CMakeLists.txt b/TestBeam/TBDetDescrCnv/CMakeLists.txt
index 3cd41dc1ce88813a029d6923e7a2242dff3239e9..3902a83a4a39be1eab3aaf7bba5e24ab331744d7 100644
--- a/TestBeam/TBDetDescrCnv/CMakeLists.txt
+++ b/TestBeam/TBDetDescrCnv/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package( Geant4 )
 atlas_add_component( TBDetDescrCnv
                      src/TB*.cxx
                      INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} DetDescrCnvSvcLib GaudiKernel StoreGateLib GeoPrimitives TBDetDescr )
+                     LINK_LIBRARIES ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} DetDescrCnvSvcLib GaudiKernel StoreGateLib GeoPrimitives TBDetDescr AthenaKernel )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx
index 3b256e29471d8aab56240b884dea4959173bcfb6..e0a9b5785fdb6a3bd5c808803fe658b326a7004a 100755
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx
+++ b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -12,10 +12,10 @@
 
 #include "DetDescrCnvSvc/DetDescrConverter.h"
 #include "DetDescrCnvSvc/DetDescrAddress.h"
+#include "AthenaKernel/StorableConversions.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
-#include "StoreGate/StoreGate.h"
 
 #include "TBDetDescr/TBDetDescrManager.h"
 
@@ -90,7 +90,7 @@ TBDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
   TBDetDescrManager* TBmgr = new TBDetDescrManager();
 
   // Pass a pointer to the container to the Persistency service by reference.
-  pObj = StoreGateSvc::asStorable(TBmgr);
+  pObj = SG::asStorable(TBmgr);
 
   // Initialize the TBDetDescr manager from FADS
 
diff --git a/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx b/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
index 413f1fbc2333191d60c8e0d64415f1a3be10cdd7..0d54a50ca94752ee9bac1db550be51ecb5bbd1d3 100644
--- a/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
@@ -1,12 +1,11 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CBNTAA_TBInfo.h"
 
 #include "GaudiKernel/IToolSvc.h"
 
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 
 #include "CaloGeoHelpers/CaloPhiRange.h"