diff --git a/tester.py b/tester.py
index 3377accfe8c1ee91d0bbdd24d46148088abd1482..0a3d0cc31b53c0fd28626e396cdb0832431c56d0 100755
--- a/tester.py
+++ b/tester.py
@@ -35,8 +35,9 @@ sys.stderr = sys.stdout
 
 
 class Tester():
-    USAGE = '''%s [-e] [-d] [-h]
+    USAGE = '''%s [-e] [-b] [-d] [-h]
     -e: send email with report.
+    -b: run only basic tests (exclude mediaserver tests).
     -d: debug mode (can be started with non root users).
     -h: show this message.''' % __file__
 
@@ -70,7 +71,8 @@ class Tester():
             sys.exit(1)
         # Check for email value
         email = '-e' in args
-        tests = self.discover_tests()
+        basic_only = '-b' in args
+        tests = self.discover_tests(basic_only)
         if not tests:
             sys.exit(1)
         exit_code = self.run_tests(tests, email)
@@ -97,7 +99,7 @@ class Tester():
                     break
         return description.strip()
 
-    def discover_tests(self):
+    def discover_tests(self, basic_only=False):
         tests = list()
         # Get standard tests
         path = os.path.join(self.root_dir, 'tests')
@@ -114,6 +116,8 @@ class Tester():
             if os.path.isfile(test_path):
                 description = self.get_file_description(test_path)
                 tests.append((name, description, [test_path]))
+        if basic_only:
+            return tests
         # Get MS instances
         ms_users = list()
         for user in os.listdir('/home'):