diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py
index b9f6e06402..bb88ec143a 100644
--- a/heat/tests/functional/util.py
+++ b/heat/tests/functional/util.py
@@ -33,7 +33,10 @@ from nose.plugins.attrib import attr
 from nose import with_setup
 from nose.exc import SkipTest
 
-from glance import client as glance_client
+try:
+    from glanceclient import client as glance_client
+except ImportError:
+    from glance import client as glance_client
 from novaclient.v1_1 import client as nova_client
 import heat
 from heat import utils
diff --git a/heat/utils.py b/heat/utils.py
index 528b40dd43..bc39b6cfd0 100644
--- a/heat/utils.py
+++ b/heat/utils.py
@@ -21,7 +21,10 @@ import base64
 from lxml import etree
 import re
 
-from glance import client as glance_client
+try:
+    from glanceclient import client as glance_client
+except ImportError:
+    from glance import client as glance_client
 from heat.common import exception
 
 from heat.openstack.common import log as logging