diff --git a/awx/main/management/commands/run_callback_receiver.py b/awx/main/management/commands/run_callback_receiver.py
index 24e399a554..9f4ee9693f 100644
--- a/awx/main/management/commands/run_callback_receiver.py
+++ b/awx/main/management/commands/run_callback_receiver.py
@@ -68,7 +68,7 @@ class CallbackReceiver(object):
 
         main_process = Process(
             target=self.callback_handler,
-            args=(use_workers, worker_queues,),
+            args=(use_workers, worker_queues,)
         )
         main_process.daemon = True
         main_process.start()
@@ -146,7 +146,6 @@ class CallbackReceiver(object):
 
                             # queue_actual_worker[2] = w
                     last_parent_events[message['job_id']] = job_parent_events
-                self.consumer_subscriber.send("1")
 
     def process_job_event(self, data):
         # Sanity check: Do we need to do anything at all?
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 0bb58efc97..be6f37cd90 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -191,7 +191,7 @@ class BaseTask(Task):
             # Log out the error to the debug logger.
             logger.debug('Database error updating %s, retrying in 5 '
                          'seconds (retry #%d): %s',
-                         self.model._meta.object_name, retry_count + 1, e)
+                         self.model._meta.object_name, _attempt + 1, e)
 
             # Attempt to retry the update, assuming we haven't already
             # tried too many times.
diff --git a/awx/main/tests/base.py b/awx/main/tests/base.py
index 4f8d6ce869..d100e67780 100644
--- a/awx/main/tests/base.py
+++ b/awx/main/tests/base.py
@@ -452,10 +452,10 @@ class BaseTestMixin(object):
         if hasattr(self, 'taskmanager_process'):
             self.taskmanager_process.terminate()
 
-    def start_queue(self, consumer_port, queue_port):
+    def start_queue(self):
         receiver = CallbackReceiver()
         self.queue_process = Process(target=receiver.run_subscriber,
-                                args=(consumer_port, queue_port, False,))
+                                     args=(False,))
         self.queue_process.start()
 
     def terminate_queue(self):
diff --git a/awx/main/tests/commands.py b/awx/main/tests/commands.py
index fea35dbc6f..c7970526e5 100644
--- a/awx/main/tests/commands.py
+++ b/awx/main/tests/commands.py
@@ -304,8 +304,7 @@ class CleanupJobsTest(BaseCommandMixin, BaseLiveServerTest):
         self.project = None
         self.credential = None
         settings.INTERNAL_API_URL = self.live_server_url
-        if settings.CALLBACK_CONSUMER_PORT:
-            self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT)
+        self.start_queue()
 
     def tearDown(self):
         super(CleanupJobsTest, self).tearDown()
diff --git a/awx/main/tests/inventory.py b/awx/main/tests/inventory.py
index 35ea310f82..65aa6e1b84 100644
--- a/awx/main/tests/inventory.py
+++ b/awx/main/tests/inventory.py
@@ -1087,7 +1087,7 @@ class InventoryUpdatesTest(BaseTransactionTest):
         self.group = self.inventory.groups.create(name='Cloud Group')
         self.inventory2 = self.organization.inventories.create(name='Cloud Inventory 2')
         self.group2 = self.inventory2.groups.create(name='Cloud Group 2')
-        self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT)
+        self.start_queue()
 
     def tearDown(self):
         super(InventoryUpdatesTest, self).tearDown()
diff --git a/awx/main/tests/jobs.py b/awx/main/tests/jobs.py
index f3da945ed3..1d7ef4eeed 100644
--- a/awx/main/tests/jobs.py
+++ b/awx/main/tests/jobs.py
@@ -680,8 +680,7 @@ class BaseJobTestMixin(BaseTestMixin):
     def setUp(self):
         super(BaseJobTestMixin, self).setUp()
         self.populate()
-        if settings.CALLBACK_CONSUMER_PORT:
-            self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT)
+        self.start_queue()
 
     def tearDown(self):
         super(BaseJobTestMixin, self).tearDown()
diff --git a/awx/main/tests/projects.py b/awx/main/tests/projects.py
index 9483ebd2e8..ced007ffdd 100644
--- a/awx/main/tests/projects.py
+++ b/awx/main/tests/projects.py
@@ -734,7 +734,7 @@ class ProjectUpdatesTest(BaseTransactionTest):
 
     def setUp(self):
         super(ProjectUpdatesTest, self).setUp()
-        self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT)
+        self.start_queue()
         self.setup_users()
 
     def tearDown(self):
diff --git a/awx/main/tests/tasks.py b/awx/main/tests/tasks.py
index d96e63ec21..682fd12933 100644
--- a/awx/main/tests/tasks.py
+++ b/awx/main/tests/tasks.py
@@ -360,8 +360,7 @@ class RunJobTest(BaseCeleryTest):
         self.credential = None
         self.cloud_credential = None
         settings.INTERNAL_API_URL = self.live_server_url
-        if settings.CALLBACK_CONSUMER_PORT:
-            self.start_queue(settings.CALLBACK_CONSUMER_PORT, settings.CALLBACK_QUEUE_PORT)
+        self.start_queue()
 
     def tearDown(self):
         super(RunJobTest, self).tearDown()