diff --git a/Control/RngComps/CMakeLists.txt b/Control/RngComps/CMakeLists.txt
index 1e5e2a291917b462fa6c177e4a30203cdd270b89..523df802e73242c8e9034dd7252ad1c292e17759 100644
--- a/Control/RngComps/CMakeLists.txt
+++ b/Control/RngComps/CMakeLists.txt
@@ -50,7 +50,7 @@ atlas_add_test( TestSeedRunEvent
 atlas_add_test( RNGWrapper_test
    SOURCES test/RNGWrapper_test.cxx
    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} AthenaKernel AtlasCLHEP_RandomGenerators TestTools )
+   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} AthenaKernel AtlasCLHEP_RandomGenerators TestTools CxxUtils )
 
 # This test takes way too long to run in the dbg build.
 if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
diff --git a/Control/RngComps/test/RNGWrapper_test.cxx b/Control/RngComps/test/RNGWrapper_test.cxx
index 8c7f1c930f24466d0c1a9b3156879cc8e1e60e18..a202a85098906d2b7dc0b29a48c1199d94fc0b33 100644
--- a/Control/RngComps/test/RNGWrapper_test.cxx
+++ b/Control/RngComps/test/RNGWrapper_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <cmath>
@@ -13,6 +13,7 @@
 #include "TestTools/expect.h"
 #include "TestTools/ParallelCallTest.h"
 #include "AtlasCLHEP_RandomGenerators/dSFMTEngine.h"
+#include "CxxUtils/checker_macros.h"
 #include "CLHEP/Random/Ranlux64Engine.h"
 #include "CLHEP/Random/RanecuEngine.h"
 #include "tbb/global_control.h"
@@ -79,9 +80,10 @@ public:
     size_t currentSlot = m_slot++ % nSlots;
 
     VALUE( currentSlot < 20 ) EXPECTED( true );
-    reseed( m_wrapper, currentSlot );
+    RNGWrapper* wrapper ATLAS_THREAD_SAFE = m_wrapper;
+    reseed( wrapper, currentSlot );
     std::vector<double>  seq;
-    pullN( m_wrapper, 10000, seq, currentSlot );
+    pullN( wrapper, 10000, seq, currentSlot );
     double sum = std::accumulate( seq.begin(), seq.end(), 0.0);
 
     VALUE( sum ) EXPECTED ( m_slot0SumRef );