diff --git a/common/lib/i18n/tests/__init__.py b/common/djangoapps/cache_toolbox/tests/__init__.py
similarity index 100%
rename from common/lib/i18n/tests/__init__.py
rename to common/djangoapps/cache_toolbox/tests/__init__.py
diff --git a/common/djangoapps/header_control/tests/__init__.py b/common/djangoapps/header_control/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/common/lib/i18n_tests/__init__.py b/common/lib/i18n_tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/common/lib/i18n/tests/test_extract_and_generate.py b/common/lib/i18n_tests/test_extract_and_generate.py
similarity index 96%
rename from common/lib/i18n/tests/test_extract_and_generate.py
rename to common/lib/i18n_tests/test_extract_and_generate.py
index 96a73bf736..6766b9ef55 100644
--- a/common/lib/i18n/tests/test_extract_and_generate.py
+++ b/common/lib/i18n_tests/test_extract_and_generate.py
@@ -28,6 +28,8 @@ class TestGenerate(TestCase):
 
     @classmethod
     def setUpClass(cls):
+        super(TestGenerate, cls).setUpClass()
+
         sys.stderr.write(
             "\nThis test tests that i18n extraction (`paver i18n_extract`) works properly. "
             "If you experience failures, please check that all instances of `gettext` and "
@@ -53,6 +55,8 @@ class TestGenerate(TestCase):
         super(TestGenerate, cls).tearDownClass()
 
     def setUp(self):
+        super(TestGenerate, self).setUp()
+
         # Subtract 1 second to help comparisons with file-modify time succeed,
         # since os.path.getmtime() is not millisecond-accurate
         self.start_time = datetime.now(UTC) - timedelta(seconds=1)
@@ -83,8 +87,9 @@ class TestGenerate(TestCase):
                 path = os.path.join(CONFIGURATION.get_messages_dir(locale), mofile)
                 exists = os.path.exists(path)
                 self.assertTrue(exists, msg='Missing file in locale %s: %s' % (locale, mofile))
-                self.assertTrue(
-                    datetime.fromtimestamp(os.path.getmtime(path), UTC) >= self.start_time,
+                self.assertGreaterEqual(
+                    datetime.fromtimestamp(os.path.getmtime(path), UTC),
+                    self.start_time,
                     msg='File not recently modified: %s' % path
                 )
             # Segmenting means that the merge headers don't work they way they
diff --git a/lms/djangoapps/verified_track_content/tests/__init__.py b/lms/djangoapps/verified_track_content/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/core/djangoapps/models/tests/__init__.py b/openedx/core/djangoapps/models/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index 61d2225552..7d63ffbb88 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -128,7 +128,7 @@ class SystemTestSuite(NoseTestSuite):
         if self.processes is None:
             # Use one process per core for LMS tests, and no multiprocessing
             # otherwise.
-            self.processes = 0
+            self.processes = -1 if self.root == 'lms' else 0
 
         self.processes = int(self.processes)