diff --git a/BUILD.gn b/BUILD.gn
index ad5f83ebfefebc1f1ce597ef0ca51cb52feab491..120bf836356f9d178a1b0aa963ada608bfbe1d5f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -189,11 +189,6 @@ config("ark_toolchain_common_config") {
   } else {
     defines += [ "NDEBUG" ]
   }
-
-  if (toolchain_enable_cmc_gc) {
-    defines += [ "USE_CMC_GC" ]
-    defines += [ "USE_READ_BARRIER" ]
-  }
 }
 
 config("ark_toolchain_public_config") {
diff --git a/tooling/test/client_utils/test_list.cpp b/tooling/test/client_utils/test_list.cpp
index 8df36cce5371ad186f3387bcdfd0f720438d4a91..ad742ab9023b01aee31aabbadd6f650939baea40 100644
--- a/tooling/test/client_utils/test_list.cpp
+++ b/tooling/test/client_utils/test_list.cpp
@@ -15,6 +15,7 @@
 
 #include "tooling/test/client_utils/test_list.h"
 
+#include "ecmascript/base/config.h"
 #include "tooling/test/client_utils/test_util.h"
 
 // testcase list
@@ -92,11 +93,11 @@ static void RegisterTests()
     TestUtil::RegisterTest("JsSourceTest", GetJsSourceTest());
     TestUtil::RegisterTest("JsTracingTest", GetJsTracingTest());
     TestUtil::RegisterTest("JsWatchTest", GetJsWatchTest());
-#ifndef USE_CMC_GC
-    // Need support heapdump
-    TestUtil::RegisterTest("JsHeapdumpTest", GetJsHeapdumpTest());
-    TestUtil::RegisterTest("JsHeapdumpLoopTest", GetJsHeapdumpLoopTest());
-#endif
+    if (!g_isEnableCMCGC) {
+        // Need support heapdump
+        TestUtil::RegisterTest("JsHeapdumpTest", GetJsHeapdumpTest());
+        TestUtil::RegisterTest("JsHeapdumpLoopTest", GetJsHeapdumpLoopTest());
+    }
     TestUtil::RegisterTest("JsStepintoTest", GetJsStepintoTest());
     TestUtil::RegisterTest("JsStepoutTest", GetJsStepoutTest());
     TestUtil::RegisterTest("JsStepoverTest", GetJsStepoverTest());
@@ -115,12 +116,12 @@ static void RegisterTests()
     TestUtil::RegisterTest("JsHeapusageTest", GetJsHeapusageTest());
     TestUtil::RegisterTest("JsHeapusageAsyncTest", GetJsHeapusageAsyncTest());
     TestUtil::RegisterTest("JsHeapusageStepTest", GetJsHeapusageStepTest());
-#ifndef USE_CMC_GC
-    // Need support allocation tracker
-    TestUtil::RegisterTest("JsAllocationtrackTest", GetJsAllocationtrackTest());
-    TestUtil::RegisterTest("JsAllocationTrackLoopTest", GetJsAllocationTrackLoopTest());
-    TestUtil::RegisterTest("JsAllocationTrackRecursionTest", GetJsAllocationTrackRecursionTest());
-#endif
+    if (!g_isEnableCMCGC) {
+        // Need support allocation tracker
+        TestUtil::RegisterTest("JsAllocationtrackTest", GetJsAllocationtrackTest());
+        TestUtil::RegisterTest("JsAllocationTrackLoopTest", GetJsAllocationTrackLoopTest());
+        TestUtil::RegisterTest("JsAllocationTrackRecursionTest", GetJsAllocationTrackRecursionTest());
+    }
     TestUtil::RegisterTest("JsJsWatchBasicTypeTest", GetJsWatchBasicTypeTest());
     TestUtil::RegisterTest("JsJsWatchSetTypeTest", GetJsWatchSetTypeTest());
     TestUtil::RegisterTest("JsJsWatchOtherTypeTest", GetJsWatchOtherTypeTest());