diff --git a/platform/tests/UNITTESTS/CircularBuffer/test_CircularBuffer.cpp b/platform/tests/UNITTESTS/CircularBuffer/test_CircularBuffer.cpp
index 4c6cdc0fd4..9d45a5404a 100644
--- a/platform/tests/UNITTESTS/CircularBuffer/test_CircularBuffer.cpp
+++ b/platform/tests/UNITTESTS/CircularBuffer/test_CircularBuffer.cpp
@@ -17,7 +17,6 @@
 
 #include "gtest/gtest.h"
 #include "platform/CircularBuffer.h"
-#include "mbed_critical_stub.c"
 
 #define TEST_BUFFER_SIZE (10)
 
diff --git a/platform/tests/UNITTESTS/CircularBuffer/unittest.cmake b/platform/tests/UNITTESTS/CircularBuffer/unittest.cmake
index fce3ae8fdd..b9c59e0ece 100644
--- a/platform/tests/UNITTESTS/CircularBuffer/unittest.cmake
+++ b/platform/tests/UNITTESTS/CircularBuffer/unittest.cmake
@@ -8,4 +8,6 @@ set(unittest-sources
 
 set(unittest-test-sources
   ../platform/tests/UNITTESTS/CircularBuffer/test_CircularBuffer.cpp
+  stubs/mbed_critical_stub.c
+  stubs/mbed_assert_stub.cpp
 )