diff --git a/nova/exception.py b/nova/exception.py
index b63406427..981363fa1 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -200,7 +200,8 @@ class VirtualInterfaceMacAddressException(NovaException):
 
 
 class GlanceConnectionFailed(NovaException):
-    message = _("Connection to glance failed") + ": %(reason)s"
+    message = _("Connection to glance host %(host)s:%(port)s failed: "
+        "%(reason)s")
 
 
 class MelangeConnectionFailed(NovaException):
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index df35d54ba..069a98c14 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -20,7 +20,6 @@ import ast
 import contextlib
 import cPickle as pickle
 import functools
-import mox
 import os
 import re
 
@@ -31,7 +30,6 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova.image import glance
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
@@ -2053,8 +2051,6 @@ class VmUtilsTestCase(test.TestCase):
     def test_upload_image(self):
         """Ensure image properties include instance system metadata
            as well as few local settings."""
-        def fake_pick_glance_api_server():
-            return ("host", 80)
 
         def fake_instance_system_metadata_get(context, uuid):
             return dict(image_a=1, image_b=2, image_c='c', d='d')
@@ -2076,8 +2072,6 @@ class VmUtilsTestCase(test.TestCase):
         def fake_dumps(thing):
             return thing
 
-        self.stubs.Set(glance, "pick_glance_api_server",
-                                                   fake_pick_glance_api_server)
         self.stubs.Set(db, "instance_system_metadata_get",
                                              fake_instance_system_metadata_get)
         self.stubs.Set(vm_utils, "get_sr_path", fake_get_sr_path)