diff --git a/include/etl/atomic.h b/include/etl/atomic.h
index d428d34c..8e030291 100644
--- a/include/etl/atomic.h
+++ b/include/etl/atomic.h
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "platform.h"
 
-#if ETL_CPP11_SUPPORTED && ETL_USING_STL
+#if ETL_CPP11_SUPPORTED && (ETL_USING_STL || defined(ETL_IN_UNIT_TEST))
   #include "atomic/atomic_std.h"
   #define ETL_HAS_ATOMIC 1
 #elif defined(ETL_COMPILER_ARM5)
diff --git a/test/test_buffer_descriptors.cpp b/test/test_buffer_descriptors.cpp
index 04e6fa95..e0075c98 100644
--- a/test/test_buffer_descriptors.cpp
+++ b/test/test_buffer_descriptors.cpp
@@ -44,7 +44,7 @@ SOFTWARE.
   #include <Windows.h>
 #endif
 
-#define REALTIME_TEST 1
+#define REALTIME_TEST 0
 
 namespace
 {