diff --git a/lib_test_CA9/main.cpp b/lib_test_CA9/main.cpp
index dc38f0f..96fa522 100644
--- a/lib_test_CA9/main.cpp
+++ b/lib_test_CA9/main.cpp
@@ -76,6 +76,10 @@ int main(void)
     TEST_F(StartWithStackSize);
     TEST_F(AssignWithStackSize);
 
+    TEST_F(TestConditionVariable);
+    TEST_F(TestCallOnce);
+    TEST_F(TestFuture);
+
 #if __cplusplus > 201907L
     TEST_F(TestJThread);
 
@@ -88,10 +92,6 @@ int main(void)
     TEST_F(TestBarrier);
     TEST_F(TestAtomicWait);
 #endif
-
-    TEST_F(TestConditionVariable);
-    TEST_F(TestCallOnce);
-    TEST_F(TestFuture);
   }
 
   print("OK\n");
diff --git a/lib_test_RISC-V/main.cpp b/lib_test_RISC-V/main.cpp
index 1d9fa3f..1e1ab90 100644
--- a/lib_test_RISC-V/main.cpp
+++ b/lib_test_RISC-V/main.cpp
@@ -76,6 +76,10 @@ int main(void)
     TEST_F(StartWithStackSize);
     TEST_F(AssignWithStackSize);
 
+    TEST_F(TestConditionVariable);
+    TEST_F(TestCallOnce);
+    TEST_F(TestFuture);
+
 #if __cplusplus > 201907L
     TEST_F(TestJThread);
 
@@ -87,10 +91,6 @@ int main(void)
     TEST_F(TestBarrier);
     TEST_F(TestAtomicWait);
 #endif
-
-    TEST_F(TestConditionVariable);
-    TEST_F(TestCallOnce);
-    TEST_F(TestFuture);
   }
   print("OK\n");
   return EXIT_SUCCESS;
diff --git a/lib_test_nxp_mk64/main.cpp b/lib_test_nxp_mk64/main.cpp
index 7123ec5..7a629ca 100644
--- a/lib_test_nxp_mk64/main.cpp
+++ b/lib_test_nxp_mk64/main.cpp
@@ -65,6 +65,10 @@ int main(void)
     StartWithStackSize();
     AssignWithStackSize();
 
+    TestConditionVariable();
+    TestCallOnce();
+    TestFuture();
+
 #if __cplusplus > 201907L
     TestJThread();
     TestSemaphore();
@@ -72,11 +76,6 @@ int main(void)
     TestBarrier();
     TestAtomicWait();
 #endif
-
-    TestConditionVariable();
-
-    TestCallOnce();
-    TestFuture();
   }
   return 0;
 }