diff --git a/kotlin-native/runtime/src/mm/cpp/TestSupport.cpp b/kotlin-native/runtime/src/mm/cpp/TestSupport.cpp
index faf2884cd69..c737fee3719 100644
--- a/kotlin-native/runtime/src/mm/cpp/TestSupport.cpp
+++ b/kotlin-native/runtime/src/mm/cpp/TestSupport.cpp
@@ -57,7 +57,7 @@ extern "C" void Kotlin_TestSupport_AssertClearGlobalState() {
 
 void kotlin::DeinitMemoryForTests(MemoryState* memoryState) {
     DeinitMemory(memoryState, false);
-    mm::ThreadRegistry::TestSupport::ClearCurrentThreadData();
+    mm::ThreadRegistry::ClearCurrentThreadData();
 }
 
 std::ostream& kotlin::operator<<(std::ostream& stream, ThreadState state) {
diff --git a/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.hpp b/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.hpp
index f32c799e8b6..1cd0fa4f00c 100644
--- a/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.hpp
+++ b/kotlin-native/runtime/src/mm/cpp/ThreadRegistry.hpp
@@ -43,10 +43,7 @@ public:
 
     bool IsCurrentThreadRegistered() const noexcept { return currentThreadDataNode_ != nullptr; }
 
-    class TestSupport {
-    public:
-        static void ClearCurrentThreadData() { currentThreadDataNode_ = nullptr; }
-    };
+    static void ClearCurrentThreadData() { currentThreadDataNode_ = nullptr; }
 
 private:
     friend class GlobalData;