diff --git a/trove/common/remote.py b/trove/common/remote.py
index 2bb2365186..3f917fade6 100644
--- a/trove/common/remote.py
+++ b/trove/common/remote.py
@@ -98,7 +98,7 @@ def nova_client(context):
                            endpoint_type=CONF.nova_compute_endpoint_type)
 
     client = Client(context.user, context.auth_token,
-                    bypass_url=url, project_id=context.tenant,
+                    bypass_url=url, tenant_id=context.tenant,
                     auth_url=PROXY_AUTH_URL)
     client.client.auth_token = context.auth_token
     client.client.management_url = url
@@ -112,8 +112,6 @@ def create_admin_nova_client(context):
     """
     client = create_nova_client(context)
     client.client.auth_token = None
-    client.client.management_url = ("%s/%s" %
-                                    (CONF.nova_compute_url, context.tenant))
     return client
 
 
diff --git a/trove/tests/unittests/common/test_remote.py b/trove/tests/unittests/common/test_remote.py
index b75b2c1a66..21d59b39e0 100644
--- a/trove/tests/unittests/common/test_remote.py
+++ b/trove/tests/unittests/common/test_remote.py
@@ -401,6 +401,21 @@ class TestCreateNovaClient(trove_testtools.TestCase):
         self.assertEqual(self.computev3_public_url_region_two,
                          client.client.management_url)
 
+    def test_create_admin_client(self):
+        nova_url_from_conf = 'http://adminexample.com/'
+        cfg.CONF.set_override('nova_compute_url', nova_url_from_conf)
+        admin_user = 'admin1'
+        admin_pass = 'adminpwd'
+        admin_tenant_id = uuid.uuid4().hex
+        admin_client = remote.create_admin_nova_client(
+            TroveContext(user=admin_user,
+                         auth_token=admin_pass,
+                         tenant=admin_tenant_id))
+        self.assertEqual(admin_user, admin_client.client.user)
+        self.assertEqual(admin_pass, admin_client.client.password)
+        self.assertEqual('%s%s' % (nova_url_from_conf, admin_tenant_id),
+                         admin_client.client.management_url)
+
 
 class TestCreateHeatClient(trove_testtools.TestCase):
     def setUp(self):