diff --git a/awx/main/tests/commands.py b/awx/main/tests/commands.py
index 39cda14201..b9d221738d 100644
--- a/awx/main/tests/commands.py
+++ b/awx/main/tests/commands.py
@@ -104,7 +104,6 @@ class BaseCommandMixin(object):
     '''
 
     def create_test_inventories(self):
-        self.setup_instances()
         self.setup_users()
         self.organizations = self.make_organizations(self.super_django_user, 2)
         self.projects = self.make_projects(self.normal_django_user, 2)
@@ -297,6 +296,7 @@ class CleanupJobsTest(BaseCommandMixin, BaseLiveServerTest):
     def setUp(self):
         super(CleanupJobsTest, self).setUp()
         self.test_project_path = None
+        self.setup_instances()
         self.setup_users()
         self.organization = self.make_organizations(self.super_django_user, 1)[0]
         self.inventory = Inventory.objects.create(name='test-inventory',
diff --git a/awx/main/tests/inventory.py b/awx/main/tests/inventory.py
index c402e61c24..0a16cf431e 100644
--- a/awx/main/tests/inventory.py
+++ b/awx/main/tests/inventory.py
@@ -1083,6 +1083,7 @@ class InventoryUpdatesTest(BaseTransactionTest):
 
     def setUp(self):
         super(InventoryUpdatesTest, self).setUp()
+        self.setup_instances()
         self.setup_users()
         self.organization = self.make_organizations(self.super_django_user, 1)[0]
         self.organization.admins.add(self.normal_django_user)
diff --git a/awx/main/tests/jobs.py b/awx/main/tests/jobs.py
index 3a4898d8fc..47a4ec3787 100644
--- a/awx/main/tests/jobs.py
+++ b/awx/main/tests/jobs.py
@@ -196,16 +196,7 @@ TEST_SURVEY_REQUIREMENTS = '''
 '''
 
 class BaseJobTestMixin(BaseTestMixin):
-    ''''''
 
-    def setUp(self):
-        self.start_redis()
-        self.setup_instances()
-        super(BaseJobTestMixin, self).setUp()
-
-    def tearDown(self):
-        self.stop_redis()
-        super(BaseJobTestMixin, self).tearDown()
 
     def _create_inventory(self, name, organization, created_by,
                           groups_hosts_dict):
@@ -698,11 +689,14 @@ class BaseJobTestMixin(BaseTestMixin):
 
     def setUp(self):
         super(BaseJobTestMixin, self).setUp()
+        self.start_redis()
+        self.setup_instances()
         self.populate()
         self.start_queue()
 
     def tearDown(self):
         super(BaseJobTestMixin, self).tearDown()
+        self.stop_redis()
         self.terminate_queue()
 
 class JobTemplateTest(BaseJobTestMixin, django.test.TestCase):
diff --git a/awx/main/tests/projects.py b/awx/main/tests/projects.py
index 8a148bea32..0a3e357667 100644
--- a/awx/main/tests/projects.py
+++ b/awx/main/tests/projects.py
@@ -42,8 +42,8 @@ class ProjectsTest(BaseTransactionTest):
         return reverse('api:project_list')
 
     def setUp(self):
-        self.setup_instances()
         super(ProjectsTest, self).setUp()
+        self.setup_instances()
         self.setup_users()
 
         self.organizations = self.make_organizations(self.super_django_user, 10)