--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -290,33 +290,30 @@ class MarionetteTestRunner(object):
             return
 
         mod_name,file_ext = os.path.splitext(os.path.split(filepath)[-1])
 
         testloader = unittest.TestLoader()
         suite = unittest.TestSuite()
 
         if file_ext == '.ini':
+            testargs = { 'skip': 'false' }
             if testtype is not None:
-                testargs = {}
                 testtypes = testtype.replace('+', ' +').replace('-', ' -').split()
                 for atype in testtypes:
                     if atype.startswith('+'):
                         testargs.update({ atype[1:]: 'true' })
                     elif atype.startswith('-'):
                         testargs.update({ atype[1:]: 'false' })
                     else:
                         testargs.update({ atype: 'true' })
+
             manifest = TestManifest()
             manifest.read(filepath)
-
-            if testtype is None:
-                manifest_tests = manifest.get()
-            else:
-                manifest_tests = manifest.get(**testargs)
+            manifest_tests = manifest.get(**testargs)
 
             for i in manifest_tests:
                 self.run_test(i["path"], testtype)
             return
 
         self.logger.info('TEST-START %s' % os.path.basename(test))
 
         if file_ext == '.py':

--- a/testing/marionette/client/marionette/tests/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit-tests.ini
@@ -3,15 +3,18 @@
 qemu = false
 
 ; true if the test is compatible with the browser, otherwise false
 browser = true
 
 ; true if the test is compatible with b2g, otherwise false
 b2g = true
 
+; true if the test should be skipped
+skip = false
+
 ; webapi tests
 [include:../../../../../dom/telephony/test/marionette/manifest.ini]
 [include:../../../../../dom/battery/test/marionette/manifest.ini]
 [include:../../../../../dom/sms/tests/manifest.ini]
 
 ; marionette unit tests
 [include:unit/unit-tests.ini]