diff --git a/workspace_tools/make.py b/workspace_tools/make.py
index e4ade4cbbf4..c2af9c6ce72 100755
--- a/workspace_tools/make.py
+++ b/workspace_tools/make.py
@@ -82,6 +82,11 @@
                       dest="macros",
                       help="Add a macro definition")
 
+    parser.add_option("--include-unsupported",
+                      action="store_true",
+                      dest="include_unsupported",
+                      help="Allow 'unsupported' tests to be built")
+
     # Local run
     parser.add_option("--automated", action="store_true", dest="automated",
                       default=False, help="Automated test")
@@ -217,7 +222,7 @@
         if options.duration is not None:     test.duration = options.duration;
         if options.extra is not None:        test.extra_files = options.extra
 
-        if not test.is_supported(mcu, toolchain):
+        if not options.include_unsupported and not test.is_supported(mcu, toolchain):
             print 'The selected test is not supported on target %s with toolchain %s' % (mcu, toolchain)
             sys.exit()
 
diff --git a/workspace_tools/singletest.py b/workspace_tools/singletest.py
index 6b5054baca3..8247fa5ffda 100644
--- a/workspace_tools/singletest.py
+++ b/workspace_tools/singletest.py
@@ -239,6 +239,7 @@ def get_version():
                                    _opts_peripheral_by_names=opts.peripheral_by_names,
                                    _opts_test_only_peripheral=opts.test_only_peripheral,
                                    _opts_test_only_common=opts.test_only_common,
+                                   _opts_include_unsupported=opts.include_unsupported,
                                    _opts_verbose_skipped_tests=opts.verbose_skipped_tests,
                                    _opts_verbose_test_result_only=opts.verbose_test_result_only,
                                    _opts_verbose=opts.verbose,
diff --git a/workspace_tools/test_api.py b/workspace_tools/test_api.py
index d80c0c3f07a..fb2d9f48220 100644
--- a/workspace_tools/test_api.py
+++ b/workspace_tools/test_api.py
@@ -176,6 +176,7 @@ def __init__(self,
                  _opts_peripheral_by_names=None,
                  _opts_test_only_peripheral=False,
                  _opts_test_only_common=False,
+                 _opts_include_unsupported=False,
                  _opts_verbose_skipped_tests=False,
                  _opts_verbose_test_result_only=False,
                  _opts_verbose=False,
@@ -231,6 +232,7 @@ def __init__(self,
         self.opts_peripheral_by_names = _opts_peripheral_by_names
         self.opts_test_only_peripheral = _opts_test_only_peripheral
         self.opts_test_only_common = _opts_test_only_common
+        self.opts_include_unsupported = _opts_include_unsupported
         self.opts_verbose_skipped_tests = _opts_verbose_skipped_tests
         self.opts_verbose_test_result_only = _opts_verbose_test_result_only
         self.opts_verbose = _opts_verbose
@@ -649,7 +651,10 @@ def get_valid_tests(self, test_map_keys, target, toolchain, test_ids, include_no
                     print self.logger.log_line(self.logger.LogType.INFO, 'Non automated test skipped for target %s'% (target))
                 continue
 
-            if test.is_supported(target, toolchain):
+            if self.opts_include_unsupported:
+                # If specfied, build all tests
+                valid_test_map_keys.append(test_id)
+            elif test.is_supported(target, toolchain):
                 if test.peripherals is None and self.opts_only_build_tests:
                     # When users are using 'build only flag' and test do not have
                     # specified peripherals we can allow test building by default
@@ -1775,6 +1780,11 @@ def get_default_test_options_parser():
                       default=False,
                       action="store_true",
                       help='Test only board internals. Skip perpherials tests and perform common tests')
+                      
+    parser.add_option("--include-unsupported",
+                      action="store_true",
+                      dest="include_unsupported",
+                      help="Allow 'unsupported' tests to be built")
 
     parser.add_option('-n', '--test-by-names',
                       dest='test_by_names',