diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index 1544ccaaaa..61d2225552 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -133,7 +133,7 @@ class SystemTestSuite(NoseTestSuite):
         self.processes = int(self.processes)
 
         if self.randomize is None:
-            self.randomize = False
+            self.randomize = self.root == 'lms'
 
         if self.processes != 0 and self.verbosity > 1:
             print colorize(
@@ -158,9 +158,12 @@ class SystemTestSuite(NoseTestSuite):
             self.extra_args,
             '--with-xunitmp',
             '--xunitmp-file={}'.format(self.report_dir / "nosetests.xml"),
-            '--processes={}'.format(self.processes),
             '--with-database-isolation',
         ]
+
+        if self.processes != 0:
+            cmd.append('--processes={}'.format(self.processes))
+
         if self.randomize:
             cmd.append('--with-randomly')