diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
index 212f2f9fecd6d0e1e95e4d25978a6d3e0cf9574e..2866d391f9fe9d7bd79ffffd8ae259068ea53096 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( CaloSimEventTPCnv )
@@ -22,28 +22,27 @@ atlas_add_dictionary( OLD_CaloSimEventTPCnvDict
 atlas_add_test( CaloCalibrationHitCnv_p1_test
                 SOURCES
                 test/CaloCalibrationHitCnv_p1_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv )
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils )
 
 atlas_add_test( CaloCalibrationHitCnv_p2_test
                 SOURCES
                 test/CaloCalibrationHitCnv_p2_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv )
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils )
 
 atlas_add_test( CaloCalibrationHitContainerCnv_p1_test
                 SOURCES
                 test/CaloCalibrationHitContainerCnv_p1_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils
                 LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
 
 atlas_add_test( CaloCalibrationHitContainerCnv_p2_test
                 SOURCES
                 test/CaloCalibrationHitContainerCnv_p2_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils
                 LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
 
 atlas_add_test( CaloCalibrationHitContainerCnv_p3_test
                 SOURCES
                 test/CaloCalibrationHitContainerCnv_p3_test.cxx
-                LINK_LIBRARIES CaloSimEventTPCnv
+                LINK_LIBRARIES CaloSimEventTPCnv CxxUtils
                 LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
-
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..028adc9e5264fb7042229d77046b3402eb545df1
--- /dev/null
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Calorimeter/CaloCnv/CaloSimEventTPCnv
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p1_test.cxx b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p1_test.cxx
index a6b71f65a4bf514a95a8fd53e4fa20b0ae7879e0..75e601c87d6f74f33467bd4905aac8ad424a24d4 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p1_test.cxx
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,12 +12,13 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -43,7 +42,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p2_test.cxx b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p2_test.cxx
index 018b1edc31b0ee1fcb1ec0e9555ebd58adf2a0b1..1a9b0bc41869f8d31490f3970ab6b4d4649759b8 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p2_test.cxx
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,12 +12,13 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitCnv_p2.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -44,7 +43,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p1_test.cxx b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p1_test.cxx
index fbc205bc0013885efc1e2da6d00b8230482e4c1c..c85be45924687d49636bce4b4031bc0472551c4e 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p1_test.cxx
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -28,7 +27,7 @@ void compare (const CaloCalibrationHit& h1,
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   MsgStream log (0, "test");
@@ -66,7 +65,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p2_test.cxx b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p2_test.cxx
index 59d3224f7371e89b1a0ac0bf0f4223450d4b4e14..420f30befbdf8cada6da9e32cfad03df21af9288 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p2_test.cxx
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p2.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -28,7 +27,7 @@ void compare (const CaloCalibrationHit& h1,
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   MsgStream log (0, "test");
@@ -67,7 +66,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p3_test.cxx b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p3_test.cxx
index 9daf537733f1105f558fe24aeef71a21e84cd345..cfb359f9bd2e87e38c86499cabe19047ec5a7210 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p3_test.cxx
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CaloSimEventTPCnv/test/CaloCalibrationHitContainerCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p3.h"
 #include "TestTools/leakcheck.h"
 #include "CaloSimEvent/CaloCalibrationHit.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -28,7 +27,7 @@ void compare (const CaloCalibrationHit& h1,
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   MsgStream log (0, "test");
@@ -70,7 +69,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;