diff --git a/openedx/core/tests/test_admin_view.py b/openedx/core/tests/test_admin_view.py
index 403c2163d1..247cdd9751 100644
--- a/openedx/core/tests/test_admin_view.py
+++ b/openedx/core/tests/test_admin_view.py
@@ -16,9 +16,21 @@ class TestAdminView(TestCase):
     def setUp(self):
         super(TestAdminView, self).setUp()
         self.client = Client()
-        self.staff_user = UserFactory.create(is_staff=True)
-        self.client.login(username=self.staff_user.username, password=TEST_PASSWORD)
 
-    def test_admin_view_loads(self):
+    def test_admin_view_loads_for_is_staff(self):
+        staff_user = UserFactory.create(is_staff=True)
+        self.client.login(username=staff_user.username, password=TEST_PASSWORD)
         response = self.client.get(reverse('admin:index'))
         assert response.status_code == 200
+
+    def test_admin_view_loads_for_is_superuser(self):
+        superuser = UserFactory.create(is_superuser=True, is_staff=True)
+        self.client.login(username=superuser.username, password=TEST_PASSWORD)
+        response = self.client.get(reverse('admin:index'))
+        assert response.status_code == 200
+
+    def test_admin_view_doesnt_load_for_student(self):
+        student = UserFactory.create()
+        self.client.login(username=student.username, password=TEST_PASSWORD)
+        response = self.client.get(reverse('admin:index'))
+        assert response.status_code == 302
diff --git a/pavelib/utils/test/suites/pytest_suite.py b/pavelib/utils/test/suites/pytest_suite.py
index 0f238abc9b..66c1f4b841 100644
--- a/pavelib/utils/test/suites/pytest_suite.py
+++ b/pavelib/utils/test/suites/pytest_suite.py
@@ -233,6 +233,7 @@ class SystemTestSuite(PytestSuite):
         if self.root == 'lms':
             default_test_globs.append("{system}/tests.py".format(system=self.root))
             default_test_globs.append("openedx/core/djangolib/*")
+            default_test_globs.append("openedx/core/tests/*")
             default_test_globs.append("openedx/features")
 
         def included(path):