diff --git a/kong/tests/test_images.py b/kong/tests/test_images.py
index 0b43182..7d2c9ce 100644
--- a/kong/tests/test_images.py
+++ b/kong/tests/test_images.py
@@ -11,23 +11,14 @@
         super(ImagesTest, self).setUp()
         self.os = openstack.Manager(self.nova)
 
-        host = self.os.config.nova.host
-        port = self.os.config.nova.port
-        self.base_url = '%s:%s' % (host, port)
-        self.api_url = os.path.join(self.base_url, self.os.config.nova.base_url)
-
-    def tearDown(self):
-        pass
-
     def _assert_image_links(self, image):
         image_id = str(image['id'])
 
-        self_link = 'http://' + os.path.join(self.api_url,
-                                             self.os.config.nova.project_id,
-                                             'images', image_id)
-        bookmark_link = 'http://' + os.path.join(self.base_url,
-                                             self.os.config.nova.project_id,
-                                             'images', image_id)
+        mgmt_url = self.os.nova.management_url
+        bmk_url = re.sub(r'v1.1\/', r'', mgmt_url)
+
+        self_link = os.path.join(mgmt_url, 'images', image_id)
+        bookmark_link = os.path.join(bmk_url, 'images', image_id)
 
         expected_links = [
             {