diff --git a/nova/console/api.py b/nova/console/api.py
index 32bf270099ab..88cefa62fba0 100644
--- a/nova/console/api.py
+++ b/nova/console/api.py
@@ -55,7 +55,7 @@ class API(base.Base):
         #               console info. I am not sure which is better
         #               here.
         instance = self._get_instance(context, instance_uuid)
-        topic = self._get_console_topic(context, instance['host']),
+        topic = self._get_console_topic(context, instance['host'])
         rpcapi = console_rpcapi.ConsoleAPI(topic=topic)
         rpcapi.add_console(context, instance['id'])
 
diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py
index 787cf1bc30f5..c46a367422e3 100644
--- a/nova/tests/console/test_console.py
+++ b/nova/tests/console/test_console.py
@@ -178,11 +178,11 @@ class ConsoleAPITestCase(test.TestCase):
 
         compute_rpcapi.ComputeAPI.get_console_topic(
             self.context, 'fake_host').AndReturn('compute.fake_host')
-
-        self.mox.StubOutWithMock(console_rpcapi.ConsoleAPI, 'add_console')
-
-        console_rpcapi.ConsoleAPI.add_console(self.context,
-                                              self.fake_instance['id'])
+        self.mox.StubOutClassWithMocks(console_rpcapi, 'ConsoleAPI')
+        console_api_mock = console_rpcapi.ConsoleAPI(
+            topic='compute.fake_host')
+        console_api_mock.add_console(self.context,
+                                     self.fake_instance['id'])
 
         self.mox.ReplayAll()