diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/ATLAS_CHECK_THREAD_SAFETY b/Event/EventCommonTPCnv/EventCommonTPCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..6d7d899d53afde0a21605e758f24b96c83251a5a
--- /dev/null
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+EventCommonTPCnv/EventCommonTPCnv
diff --git a/Event/EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx
index 222bc5020b1ba9417a3fa36ea2bdc726058d56e9..54d7332559864944c4c904bb3305be9ddff8d628 100644
--- a/Event/EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/HepLorentzVectorCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -15,6 +13,7 @@
 #include "CLHEP/Vector/LorentzVector.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -38,7 +37,7 @@ void testit (const CLHEP::HepLorentzVector& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -49,7 +48,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "HepLorentzVectorCnv_p1_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
index 0a499cd727847ed92ec7a56e5aa928bcce4e6849..13b04077f5fe0a1f606676405bb43d85053bf290 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
@@ -18,6 +18,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ServiceHandle.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -65,7 +66,7 @@ void testit (const INav4MomAssocs& trans1, StoreGateSvc* sg)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -98,7 +99,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "INav4MomAssocsCnv_p1_test\n";
 
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
index 133acf63a16e0b00ac015d0f9774c99f633573c2..65a7010946d60ea01cf64b847decbff05458ac57 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
@@ -17,6 +17,7 @@
 #include "SGTools/TestStore.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -64,7 +65,7 @@ void testit (const INav4MomAssocs& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -96,7 +97,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "INav4MomAssocsCnv_p2_test\n";
   SGTest::initTestStore();
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
index 5931e6e173c4441f30bfec207e01ae16809365fe..be56da407f339f8fc81fef415be0524f64cd3ac7 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
@@ -17,6 +17,7 @@
 #include "SGTools/TestStore.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -64,7 +65,7 @@ void testit (const INav4MomAssocs& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -96,7 +97,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "INav4MomAssocsCnv_p3_test\n";
   SGTest::initTestStore();
diff --git a/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx
index adf9cc98eb4587e9c741a0ab511bf1b206383638..1996ceb751fc807617b383bce9837a6586ac8ecf 100644
--- a/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4EEtaPhiMCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4EEtaPhiMCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4EEtaPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4EEtaPhiMCnv_p1_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx
index 41cd8b3cc69abf8a336ed68341da18a9a7caddbf..127ad822e345244e99c97700078033d63845779c 100644
--- a/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4EEtaPhiMCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4EEtaPhiMCnv_p2.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4EEtaPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4EEtaPhiMCnv_p2_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx
index de1d3510e29005ef2c2bb1f8c388a7264fbe112f..e1d57279604d6fa52a2406656dedaab44f0f5958 100644
--- a/Event/EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4IPtCotThPhiMCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4IPtCotThPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4IPtCotThPhiMCnv_p1_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx
index 7eb80e4e2923b2488f8ad665497f55a73d18a4b1..26c5a2e2856bf1049dc6863565d1ba5a5386e257 100644
--- a/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4ImplEEtaPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4ImplEEtaPhiMCnv_p1_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx
index b003b177a82abf9c828b9d2fef3a279778159cea..11866c0e883c07b58f9da31be52ed44fc47bf844 100644
--- a/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4ImplEEtaPhiMCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4ImplEEtaPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4ImplEEtaPhiMCnv_p2_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx
index 193c23a4fe3c5073ccc30c60ff01b3dffb4b17c3..0c39f2826d8d40dcd734c34aed6209a3f64b0897 100644
--- a/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4ImplPtEtaPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4ImplPtEtaPhiMCnv_p1_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx
index 20ebb62d2eb69caa5b0236ea316b3fbb9a6bdb86..c031675476c67c1f51ada419210ee8cbd2e32c9f 100644
--- a/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4ImplPtEtaPhiMCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4ImplPtEtaPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4ImplPtEtaPhiMCnv_p2_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx
index d557b8b839b160eec0909fb4e1f6d4b807be3d67..db3c2d94ae35f21050848bd61ff421aa0b04f392 100644
--- a/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4PtEtaPhiMCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4PtEtaPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4PtEtaPhiMCnv_p1_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx
index c48c84ba98613643383b6f60d8ecc2f4c0ba4951..40c84e4d2d69e66cca5bfc25390c5213ff6513e4 100644
--- a/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4PtEtaPhiMCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4PtEtaPhiM& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4PtEtaPhiMCnv_p2_test\n";
   test1();
diff --git a/Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx b/Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx
index e72695e13cda888d52160fd234b6e1bb4d3e52c3..fc0a21771d9e3adec19d5589fee9a369f3c7bffc 100644
--- a/Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file EventCommonTPCnv/test/P4PxPyPzECnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #include "EventCommonTPCnv/P4PxPyPzECnv_p1.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -40,7 +39,7 @@ void testit (const P4PxPyPzE& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
 
@@ -51,7 +50,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "P4PxPyPzECnv_p1_test\n";
   test1();