diff --git a/libraries/tests/mbed/div/main.cpp b/libraries/tests/mbed/div/main.cpp
index 936435d67f..fbaa46569a 100644
--- a/libraries/tests/mbed/div/main.cpp
+++ b/libraries/tests/mbed/div/main.cpp
@@ -17,6 +17,11 @@ const char *result_str(bool result) {
 }
 
 int main() {
+    TEST_TIMEOUT(20);
+    TEST_HOSTTEST(default_auto);
+    TEST_DESCRIPTION(Integer constant division);
+    TEST_START("MBED_26");
+
     bool result = true;
 
     {   // 0xFFFFFFFF *  8 =  0x7fffffff8
@@ -35,6 +40,5 @@ int main() {
         printf("64bit: 0x17FFFFFFE8: expected 0x%lX got 0x%lX ... %s\r\n", values.first, test_ret, result_str(test_res));
     }
 
-    notify_completion(result);
-    return 0;
+    TEST_RESULT(result);
 }
diff --git a/libraries/tests/mbed/vtor_reloc/main.cpp b/libraries/tests/mbed/vtor_reloc/main.cpp
index f5640fe50f..e3e31842e5 100644
--- a/libraries/tests/mbed/vtor_reloc/main.cpp
+++ b/libraries/tests/mbed/vtor_reloc/main.cpp
@@ -46,14 +46,17 @@ static bool test_once() {
 }
 
 int main() {
+    TEST_TIMEOUT(15);
+    TEST_HOSTTEST(default_auto);
+    TEST_DESCRIPTION(Interrupt vector relocation);
+    TEST_START("MBED_A18");
 
     // First test, no table reallocation
     {
         printf("Starting first test (interrupts not relocated).\r\n");
         bool ret = test_once();
         if (ret == false) {
-            notify_completion(false);
-            return 1;
+            TEST_RESULT(false);
         }
     }
 
@@ -65,11 +68,9 @@ int main() {
 
         bool ret = test_once();
         if (ret == false) {
-            notify_completion(false);
-            return 1;
+            TEST_RESULT(false);
         }
     }
 
-    notify_completion(true);
-    return 0;
+    TEST_RESULT(true);
 }