diff --git a/TESTS/mbed_drivers/stl_features/main.cpp b/TESTS/mbed_drivers/stl_features/main.cpp
index ec99282d45..2cfbd2b50c 100644
--- a/TESTS/mbed_drivers/stl_features/main.cpp
+++ b/TESTS/mbed_drivers/stl_features/main.cpp
@@ -14,6 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "mbed.h"
+#include "greentea-client/test_env.h"
+#include "unity/unity.h"
+#include "utest/utest.h"
 #include <stdio.h>
 #include <string.h>
 #include <algorithm>
@@ -22,10 +26,6 @@
 #include <queue>
 #include <map>
 #include <math.h>
-#include "mbed.h"
-#include "greentea-client/test_env.h"
-#include "unity/unity.h"
-#include "utest/utest.h"
 
 using namespace utest::v1;
 
diff --git a/TESTS/mbedmicro-mbed/attributes/attributes.c b/TESTS/mbedmicro-mbed/attributes/attributes.c
index f8ad7f7a40..1130b43461 100644
--- a/TESTS/mbedmicro-mbed/attributes/attributes.c
+++ b/TESTS/mbedmicro-mbed/attributes/attributes.c
@@ -29,15 +29,15 @@ int testPacked() {
 }
 
 
+MBED_ALIGN(8)  char a;
+MBED_ALIGN(8)  char b;
+MBED_ALIGN(16) char c;
+MBED_ALIGN(8)  char d;
+MBED_ALIGN(16) char e;
+
 int testAlign() {
     int failed = 0;
 
-    MBED_ALIGN(8)  char a;
-    MBED_ALIGN(8)  char b;
-    MBED_ALIGN(16) char c;
-    MBED_ALIGN(8)  char d;
-    MBED_ALIGN(16) char e;
-
     if(((uintptr_t)&a) & 0x7){
         failed++;
     }