diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/CMakeLists.txt b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/CMakeLists.txt
index 6d01c19eedc0e47abfa904a6ef49f95055c3e3ca..1480949145ebe20c1e1e9cb57b90bf5aca7b2201 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/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( AFP_EventTPCnv )
@@ -24,7 +24,7 @@ foreach( test AFP_SiDigiCnv_p1_test
 
    atlas_add_test( ${test}
       SOURCES test/${test}.cxx
-      LINK_LIBRARIES GaudiKernel TestTools AFP_EventTPCnv )
+      LINK_LIBRARIES GaudiKernel TestTools AFP_EventTPCnv CxxUtils )
 
 endforeach()
 
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDLocRecoEvCollectionCnv_p1_test.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDLocRecoEvCollectionCnv_p1_test.cxx
index 7c37c2c5c77744eb48de9e45e34306294e8bc9a3..ef125a481ad326701c8eb573d31c3cf654a770da 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDLocRecoEvCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDLocRecoEvCollectionCnv_p1_test.cxx
@@ -11,6 +11,7 @@
 
 #undef NDEBUG
 #include "AFP_EventTPCnv/AFP_SIDLocRecoEvCollectionCnv_p1.h"
+#include "CxxUtils/checker_macros.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
@@ -57,7 +58,7 @@ void testit (const AFP_SIDLocRecoEvCollection& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -76,7 +77,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "AFP_EventTPCnv/AFP_SIDLocRecoEvCollectionCnv_p1_test\n";
   test1();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDLocRecoEventCnv_p1_test.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDLocRecoEventCnv_p1_test.cxx
index 5e3f46e2ef6496383730514fdc810e9890b24089..b1ccb3c148ff0a4f883e7ac0ee7ab80bc9e914c1 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDLocRecoEventCnv_p1_test.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDLocRecoEventCnv_p1_test.cxx
@@ -11,6 +11,7 @@
 
 #undef NDEBUG
 #include "AFP_EventTPCnv/AFP_SIDLocRecoEventCnv_p1.h"
+#include "CxxUtils/checker_macros.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
@@ -47,7 +48,7 @@ void testit (const AFP_SIDLocRecoEvent& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -61,7 +62,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "AFP_EventTPCnv/AFP_SIDLocRecoEventCnv_p1_test\n";
   test1();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDSimHitCnv_p1_test.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDSimHitCnv_p1_test.cxx
index b52765ea2758b29594c5eabc366bf1cdf2748bd5..1e6d72222491dbd515ef389f18ce59d00bebbc87 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDSimHitCnv_p1_test.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SIDSimHitCnv_p1_test.cxx
@@ -11,6 +11,7 @@
 
 #undef NDEBUG
 #include "AFP_EventTPCnv/AFP_SIDSimHitCnv_p1.h"
+#include "CxxUtils/checker_macros.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
@@ -53,7 +54,7 @@ void testit (const AFP_SIDSimHit& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -81,7 +82,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "AFP_EventTPCnv/AFP_SIDSimHitCnv_p1_test\n";
   test1();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SiDigiCnv_p1_test.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SiDigiCnv_p1_test.cxx
index 96e75af1362079b67a15c39c31eb7c5fd66fd500..477857c2e2ef6eed27fce301de2cf2150aef3c61 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SiDigiCnv_p1_test.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_SiDigiCnv_p1_test.cxx
@@ -11,6 +11,7 @@
 
 #undef NDEBUG
 #include "AFP_EventTPCnv/AFP_SiDigiCnv_p1.h"
+#include "CxxUtils/checker_macros.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
@@ -42,7 +43,7 @@ void testit (const AFP_SiDigi& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -59,7 +60,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "AFP_EventTPCnv/AFP_SiDigiCnv_p1_test\n";
   test1();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDDigiCnv_p1_test.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDDigiCnv_p1_test.cxx
index e6081994eced73a3d28f83294ee2065cad42f852..d4c3c9c66839ac66eaa0b31bce3bf34f1d986e67 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDDigiCnv_p1_test.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDDigiCnv_p1_test.cxx
@@ -11,6 +11,7 @@
 
 #undef NDEBUG
 #include "AFP_EventTPCnv/AFP_TDDigiCnv_p1.h"
+#include "CxxUtils/checker_macros.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
@@ -41,7 +42,7 @@ void testit (const AFP_TDDigi& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -57,7 +58,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "AFP_EventTPCnv/AFP_TDDigiCnv_p1_test\n";
   test1();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDLocRecoEvCollectionCnv_p1_test.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDLocRecoEvCollectionCnv_p1_test.cxx
index 8aa7b3813c52f8d752504e1554b4aa1561d916b6..323e5192f33034e20fd51966950b0f634475b33e 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDLocRecoEvCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDLocRecoEvCollectionCnv_p1_test.cxx
@@ -11,6 +11,7 @@
 
 #undef NDEBUG
 #include "AFP_EventTPCnv/AFP_TDLocRecoEvCollectionCnv_p1.h"
+#include "CxxUtils/checker_macros.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
@@ -52,7 +53,7 @@ void testit (const AFP_TDLocRecoEvCollection& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -69,7 +70,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "AFP_EventTPCnv/AFP_TDLocRecoEvCollectionCnv_p1_test\n";
   test1();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDLocRecoEventCnv_p1_test.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDLocRecoEventCnv_p1_test.cxx
index ebfeeddbc1ce301d5e5217653c5b0a15720413a0..367668512b9a7e807dca654a244a308c82a00b40 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDLocRecoEventCnv_p1_test.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDLocRecoEventCnv_p1_test.cxx
@@ -11,6 +11,7 @@
 
 #undef NDEBUG
 #include "AFP_EventTPCnv/AFP_TDLocRecoEventCnv_p1.h"
+#include "CxxUtils/checker_macros.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
@@ -42,7 +43,7 @@ void testit (const AFP_TDLocRecoEvent& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -54,7 +55,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "AFP_EventTPCnv/AFP_TDLocRecoEventCnv_p1_test\n";
   test1();
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDSimHitCnv_p1_test.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDSimHitCnv_p1_test.cxx
index bfffc91bb142858c619b28910e721b2cfa5e539a..b1f5ce82beb12c21742b18a56a205990606a31ed 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDSimHitCnv_p1_test.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/test/AFP_TDSimHitCnv_p1_test.cxx
@@ -11,6 +11,7 @@
 
 #undef NDEBUG
 #include "AFP_EventTPCnv/AFP_TDSimHitCnv_p1.h"
+#include "CxxUtils/checker_macros.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
@@ -52,7 +53,7 @@ void testit (const AFP_TDSimHit& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -79,7 +80,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "AFP_EventTPCnv/AFP_TDSimHitCnv_p1_test\n";
   test1();