diff --git a/test/test_atomic.cpp b/test/test_atomic.cpp
index 96363239..79372798 100644
--- a/test/test_atomic.cpp
+++ b/test/test_atomic.cpp
@@ -76,10 +76,10 @@ namespace
 
       CHECK_EQUAL(compare.is_lock_free(), test.is_lock_free());
 
-#if ETL_NOT_USING_STL && (defined(ETL_COMPILER_ARM5) || defined(ETL_COMPILER_ARM6) || defined(ETL_COMPILER_GCC) || defined(ETL_COMPILER_CLANG))
-      CHECK_TRUE(etl::atomic<int>::is_always_lock_free);
-      CHECK_TRUE(test.is_always_lock_free);
-#endif
+//#if ETL_NOT_USING_STL && (defined(ETL_COMPILER_ARM5) || defined(ETL_COMPILER_ARM6) || defined(ETL_COMPILER_GCC) || defined(ETL_COMPILER_CLANG))
+//      CHECK_TRUE(etl::atomic<int>::is_always_lock_free);
+//      CHECK_TRUE(test.is_always_lock_free);
+//#endif
     }
 
     //*************************************************************************
@@ -90,28 +90,28 @@ namespace
 
       CHECK_EQUAL(compare.is_lock_free(), test.is_lock_free());
 
-#if ETL_NOT_USING_STL && (defined(ETL_COMPILER_ARM5) || defined(ETL_COMPILER_ARM6) || defined(ETL_COMPILER_GCC) || defined(ETL_COMPILER_CLANG))
-      CHECK_TRUE(etl::atomic<int*>::is_always_lock_free);
-      CHECK_TRUE(test.is_always_lock_free);
-#endif
+//#if ETL_NOT_USING_STL && (defined(ETL_COMPILER_ARM5) || defined(ETL_COMPILER_ARM6) || defined(ETL_COMPILER_GCC) || defined(ETL_COMPILER_CLANG))
+//      CHECK_TRUE(etl::atomic<int*>::is_always_lock_free);
+//      CHECK_TRUE(test.is_always_lock_free);
+//#endif
     }
 
-#if ETL_NOT_USING_STL && (defined(ETL_COMPILER_ARM5) || defined(ETL_COMPILER_ARM6) || defined(ETL_COMPILER_GCC) || defined(ETL_COMPILER_CLANG))
-    //*************************************************************************
-    TEST(test_atomic_is_always_lock_free)
-    {
-      struct S 
-      {
-        int a;
-        int b;
-        int c;
-      };
-
-      CHECK_TRUE(etl::atomic<int>::is_always_lock_free);
-      CHECK_TRUE(etl::atomic<int*>::is_always_lock_free);
-      CHECK_FALSE(etl::atomic<S>::is_always_lock_free);
-    }
-#endif
+//#if ETL_NOT_USING_STL && (defined(ETL_COMPILER_ARM5) || defined(ETL_COMPILER_ARM6) || defined(ETL_COMPILER_GCC) || defined(ETL_COMPILER_CLANG))
+//    //*************************************************************************
+//    TEST(test_atomic_is_always_lock_free)
+//    {
+//      struct S 
+//      {
+//        int a;
+//        int b;
+//        int c;
+//      };
+//
+//      CHECK_TRUE(etl::atomic<int>::is_always_lock_free);
+//      CHECK_TRUE(etl::atomic<int*>::is_always_lock_free);
+//      CHECK_FALSE(etl::atomic<S>::is_always_lock_free);
+//    }
+//#endif
 
     //*************************************************************************
     TEST(test_atomic_integer_load)