diff --git a/libraries/tests/mbed/cpp/main.cpp b/libraries/tests/mbed/cpp/main.cpp
index f1f1b2be99..b565cf0006 100644
--- a/libraries/tests/mbed/cpp/main.cpp
+++ b/libraries/tests/mbed/cpp/main.cpp
@@ -54,6 +54,11 @@ Heap::hello
 Heap::destroy
 *******************/
 int main (void) {
+    TEST_TIMEOUT(10);
+    TEST_HOSTTEST(default_auto);
+    TEST_DESCRIPTION(C++);
+    TEST_START("MBED_12");
+
     bool result = true;
     for (;;)
     {
@@ -77,6 +82,5 @@ int main (void) {
         break;
     }
 
-    notify_completion(result);
-    return 0;
+    TEST_RESULT(result);
 }
diff --git a/workspace_tools/host_tests/host_test.py b/workspace_tools/host_tests/host_test.py
index ff2ff697c4..e8f61ff2b0 100644
--- a/workspace_tools/host_tests/host_test.py
+++ b/workspace_tools/host_tests/host_test.py
@@ -283,7 +283,7 @@ class Test(HostTestResults):
                 self.notify("HOST: Start test...")
                 break
             else:
-                m = re.search('{([\w_]+);([\w\d ]+)}}', line[:-1])
+                m = re.search('{([\w_]+);([\w\d\+ ]+)}}', line[:-1])
                 if m and len(m.groups()) == 2:
                     result[m.group(1)] = m.group(2)
                     if verbose: