diff --git a/TESTS/mbedmicro-rtos-mbed/CircularBuffer/main.cpp b/TESTS/mbed_platform/CircularBuffer/main.cpp
similarity index 100%
rename from TESTS/mbedmicro-rtos-mbed/CircularBuffer/main.cpp
rename to TESTS/mbed_platform/CircularBuffer/main.cpp
diff --git a/platform/CircularBuffer.h b/platform/CircularBuffer.h
index 691284ae95..d6db5e6eb9 100644
--- a/platform/CircularBuffer.h
+++ b/platform/CircularBuffer.h
@@ -92,12 +92,12 @@ public:
         core_util_critical_section_enter();
         if (full()) {
             _tail++;
-            if(_tail == BufferSize) {
+            if (_tail == BufferSize) {
                 _tail = 0;
             }
         }
         _pool[_head++] = data;
-        if(_head == BufferSize) {
+        if (_head == BufferSize) {
                 _head = 0;
         }
         if (_head == _tail) {
@@ -117,7 +117,7 @@ public:
         core_util_critical_section_enter();
         if (!empty()) {
             data = _pool[_tail++];
-            if(_tail == BufferSize) {
+            if (_tail == BufferSize) {
                 _tail = 0;
             }
             _full = false;