diff --git a/Trigger/TrigEvent/TrigMissingEtEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigMissingEtEventTPCnv/CMakeLists.txt
index 521addfa9195dd7a83b7b55aa979ea08ac2ad1f9..5a92e4ea55ea07be4d0c9af618c72b7b92f505b8 100644
--- a/Trigger/TrigEvent/TrigMissingEtEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigMissingEtEventTPCnv/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( TrigMissingEtEventTPCnv )
@@ -18,9 +18,9 @@ atlas_add_dictionary( TrigMissingEtEventTPCnvDict
 atlas_add_test( TrigMissingETCnv_p2_test
                 SOURCES
                 test/TrigMissingETCnv_p2_test.cxx
-                LINK_LIBRARIES GaudiKernel TestTools TrigMissingEtEventTPCnv )
+                LINK_LIBRARIES GaudiKernel TestTools TrigMissingEtEventTPCnv CxxUtils )
 
 atlas_add_test( TrigMissingETCnv_p3_test
                 SOURCES
                 test/TrigMissingETCnv_p3_test.cxx
-                LINK_LIBRARIES GaudiKernel TestTools TrigMissingEtEventTPCnv )
+                LINK_LIBRARIES GaudiKernel TestTools TrigMissingEtEventTPCnv CxxUtils )
diff --git a/Trigger/TrigEvent/TrigMissingEtEventTPCnv/TrigMissingEtEventTPCnv/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigEvent/TrigMissingEtEventTPCnv/TrigMissingEtEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..28bcc9336261c846db9cc4e64e695c58e5ecfa46
--- /dev/null
+++ b/Trigger/TrigEvent/TrigMissingEtEventTPCnv/TrigMissingEtEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigEvent/TrigMissingEtEventTPCnv
diff --git a/Trigger/TrigEvent/TrigMissingEtEventTPCnv/test/TrigMissingETCnv_p2_test.cxx b/Trigger/TrigEvent/TrigMissingEtEventTPCnv/test/TrigMissingETCnv_p2_test.cxx
index a19b1390867812670873a8a77db51178e684255f..67b0191ee4d6d71de56e131a30264d9c5bb0d433 100644
--- a/Trigger/TrigEvent/TrigMissingEtEventTPCnv/test/TrigMissingETCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigMissingEtEventTPCnv/test/TrigMissingETCnv_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 TrigMissingEtEventTPCnv/test/TrigMissingETCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigMissingEtEventTPCnv/TrigMissingETCnv_p2.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -60,7 +59,7 @@ void testit (const TrigMissingET& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -94,7 +93,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigMissingEtEventTPCnv/test/TrigMissingETCnv_p3_test.cxx b/Trigger/TrigEvent/TrigMissingEtEventTPCnv/test/TrigMissingETCnv_p3_test.cxx
index de22dd7d7a55496b7e3d812e2bf0b1159ee6b42f..d912f7072e5be895b57662efe0b7334e738fa54d 100644
--- a/Trigger/TrigEvent/TrigMissingEtEventTPCnv/test/TrigMissingETCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigMissingEtEventTPCnv/test/TrigMissingETCnv_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 TrigMissingEtEventTPCnv/test/TrigMissingETCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigMissingEtEventTPCnv/TrigMissingETCnv_p3.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -60,7 +59,7 @@ void testit (const TrigMissingET& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -94,7 +93,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt
index 593120d405deec97167e677944e17dad8589b174..bb7bd0334ceb7e3da164aed9b2989fcb48be511a 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/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( TrigMuonEventTPCnv )
@@ -25,7 +25,7 @@ function( _add_test test )
    atlas_add_test( ${test}
                    SOURCES
                    test/${test}.cxx
-                   LINK_LIBRARIES GaudiKernel TestTools TrigMuonEventTPCnv )
+                   LINK_LIBRARIES GaudiKernel TestTools TrigMuonEventTPCnv CxxUtils )
 endfunction()
 
 _add_test( CombinedMuonFeatureCnv_p2_test )