diff --git a/tester.py b/tester.py
index 650abef8da85a492263e71e54a02cd48f1765917..8a8b552b8569f98574f54af55a806b7a58005c1e 100755
--- a/tester.py
+++ b/tester.py
@@ -99,9 +99,9 @@ class Tester():
                     log('USAGE: ' + self.USAGE)
                     sys.exit(1)
             else:
-                log("Optional target user : %s" % arg)
+                log('Optional target user : %s' % arg)
                 if not os.path.isdir(os.path.join('/home', arg)):
-                    log("Mediaserver user %s does not exist" % arg)
+                    log('Mediaserver user %s does not exist' % arg)
                     sys.exit(1)
                 else:
                     msuser = arg
@@ -240,13 +240,15 @@ class Tester():
             ms_path = os.path.join(path, 'ms-testing-suite')
             if not os.path.exists(ms_path):
                 log('Cloning ms-testing-suite in "%s".' % ms_path)
-                subprocess.check_call(['git', 'clone', '--recursive', 'https://panel.ubicast.eu/git/mediaserver/ms-testing-suite.git', ms_path])
-            log('Updating ms-testing-suite in "%s".' % ms_path)
-            os.chdir(ms_path)
-            subprocess.check_call(['git', 'pull', '--recurse-submodules'])
-            subprocess.check_call(['git', 'submodule', 'update', '--init', '--recursive'])
-            os.chdir(self.root_dir)
+                subprocess.call(['git', 'clone', '--recursive', 'https://panel.ubicast.eu/git/mediaserver/ms-testing-suite.git', ms_path])
+            if os.path.exists(ms_path):
+                log('Updating ms-testing-suite in "%s".' % ms_path)
+                os.chdir(ms_path)
+                subprocess.call(['git', 'pull', '--recurse-submodules'])
+                subprocess.call(['git', 'submodule', 'update', '--init', '--recursive'])
+                os.chdir(self.root_dir)
             # Add tests to list
+            log('Add MediaServer tests if available.' % ms_path)
             wowza_dir = '/usr/local/WowzaStreamingEngine'
             etc_lives_conf = '/etc/mediaserver/lives_conf.py'
             local_lives_conf = '/home/%s/msinstance/conf/lives_conf.py'