diff --git a/indra/llcommon/tests/llmainthreadtask_test.cpp b/indra/llcommon/tests/llmainthreadtask_test.cpp
index 69b11ccafbbce3222207d78efed4f8111ea003c4..e75a80ef77ef2db557a2be1c780fa3d352ec81e5 100644
--- a/indra/llcommon/tests/llmainthreadtask_test.cpp
+++ b/indra/llcommon/tests/llmainthreadtask_test.cpp
@@ -61,16 +61,16 @@ namespace tut
 
     struct StaticData
     {
-        std::mutex mMutex;          // LockStatic looks for mMutex
+        LLMutex mMutex;          // LockStatic looks for mMutex
         bool ran{false};
     };
-    typedef llthread::LockStatic<StaticData> LockStatic;
+    typedef llthread::LockStaticLL<StaticData> LockStatic;
 
     template<> template<>
     void object::test<2>()
     {
         set_test_name("cross-thread");
-        skip("This test is prone to build-time hangs");
+        //skip("This test is prone to build-time hangs");
         std::atomic_bool result(false);
         // wrapping our thread lambda in a packaged_task will catch any
         // exceptions it might throw and deliver them via future