diff --git a/heat/common/short_id.py b/heat/common/short_id.py
index 75a500b10..74769b105 100644
--- a/heat/common/short_id.py
+++ b/heat/common/short_id.py
@@ -19,6 +19,8 @@ each comprise 12 (lower-case) alphanumeric characters.
 import base64
 import uuid
 
+from six.moves import xrange
+
 
 def _to_byte_string(value, num_bits):
     '''
diff --git a/heat/engine/dependencies.py b/heat/engine/dependencies.py
index bba3c8351..bd69b9514 100644
--- a/heat/engine/dependencies.py
+++ b/heat/engine/dependencies.py
@@ -15,6 +15,8 @@
 import collections
 import itertools
 
+from six.moves import xrange
+
 from heat.common import exception
 
 from heat.openstack.common.gettextutils import _
diff --git a/heat/engine/resources/random_string.py b/heat/engine/resources/random_string.py
index 3c384e850..4ddd86774 100644
--- a/heat/engine/resources/random_string.py
+++ b/heat/engine/resources/random_string.py
@@ -15,6 +15,8 @@
 import random
 import string
 
+from six.moves import xrange
+
 from heat.db import api as db_api
 from heat.engine import constraints
 from heat.engine import properties
diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 01aa072b6..7221755a2 100644
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -18,6 +18,7 @@ import time
 from keystoneclient import exceptions as kc_exceptions
 from mox import IgnoreArg
 from oslo.config import cfg
+from six.moves import xrange
 
 from heat.engine import environment
 from heat.common import exception