diff --git a/openedx/tests/__init__.py b/openedx/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openedx/tests/xblock_integration/__init__.py b/openedx/tests/xblock_integration/__init__.py
new file mode 100644
index 0000000000..66adf2540e
--- /dev/null
+++ b/openedx/tests/xblock_integration/__init__.py
@@ -0,0 +1,7 @@
+"""Tests of XBlocks integrated with edx-platform.
+
+These tests exercise XBlocks which may live in other repos, to confirm both
+that the XBlock works, and that edx-platform continues to properly support the
+XBlock.
+
+"""
diff --git a/lms/djangoapps/courseware/tests/test_recommender.py b/openedx/tests/xblock_integration/test_recommender.py
similarity index 100%
rename from lms/djangoapps/courseware/tests/test_recommender.py
rename to openedx/tests/xblock_integration/test_recommender.py
diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index 5dab89cdbc..7531ebf48f 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -145,20 +145,23 @@ class SystemTestSuite(NoseTestSuite):
         # django-nose will import them early in the test process,
         # thereby making sure that we load any django models that are
         # only defined in test files.
-        default_test_id = "{system}/djangoapps/* common/djangoapps/* openedx/core/djangoapps/*".format(
-            system=self.root
+        default_test_id = (
+            "{system}/djangoapps/*"
+            " common/djangoapps/*"
+            " openedx/core/djangoapps/*"
+            " openedx/tests/*"
         )
 
         if self.root in ('lms', 'cms'):
-            default_test_id += " {system}/lib/*".format(system=self.root)
+            default_test_id += " {system}/lib/*"
 
         if self.root == 'lms':
-            default_test_id += " {system}/tests.py".format(system=self.root)
+            default_test_id += " {system}/tests.py"
 
         if self.root == 'cms':
-            default_test_id += " {system}/tests/*".format(system=self.root)
+            default_test_id += " {system}/tests/*"
 
-        return default_test_id
+        return default_test_id.format(system=self.root)
 
 
 class LibTestSuite(NoseTestSuite):