diff --git a/tools/build_api.py b/tools/build_api.py
index 3904cd3bf3..e34e74d6e6 100644
--- a/tools/build_api.py
+++ b/tools/build_api.py
@@ -521,8 +521,6 @@ def build_lib(lib_id, target, toolchain_name, options=None, verbose=False, clean
             if toolchain_output:
                 cur_result["output"] += toolchain_output
 
-            cur_result["output"] += str(e)
-
             add_result_to_report(report, cur_result)
 
         # Let Exception propagate
diff --git a/tools/test.py b/tools/test.py
index 1c7fbcd5d2..16e002bee2 100644
--- a/tools/test.py
+++ b/tools/test.py
@@ -21,6 +21,7 @@ TEST BUILD & RUN
 import sys
 import os
 import json
+import fnmatch
 
 ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 sys.path.insert(0, ROOT)
@@ -105,8 +106,10 @@ if __name__ == '__main__':
             
             all_tests_keys = all_tests.keys()
             for name in all_names:
-                if name in all_tests_keys:
-                    tests[name] = all_tests[name]
+                if any(fnmatch.fnmatch(testname, name) for testname in all_tests):
+                    for testname, test in all_tests.items():
+                        if fnmatch.fnmatch(testname, name):
+                            tests[testname] = test
                 else:
                     print "[Warning] Test with name '%s' was not found in the available tests" % (name)
         else:
diff --git a/tools/test_api.py b/tools/test_api.py
index 9cdedf9dc9..9872d62316 100644
--- a/tools/test_api.py
+++ b/tools/test_api.py
@@ -2077,12 +2077,13 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
                                      verbose=verbose)
 
         except Exception, e:
-            result = False
-            
-            if continue_on_build_fail:
-                continue
-            else:
-                break
+            if not isinstance(e, NotSupportedException):
+                result = False
+                
+                if continue_on_build_fail:
+                    continue
+                else:
+                    break
         
         # If a clean build was carried out last time, disable it for the next build.
         # Otherwise the previously built test will be deleted.