diff --git a/cloudpulse/common/utils.py b/cloudpulse/common/utils.py
index ff3b34b..be1f1e5 100644
--- a/cloudpulse/common/utils.py
+++ b/cloudpulse/common/utils.py
@@ -26,6 +26,7 @@ import pecan
 import random
 import re
 import shutil
+import sys
 import tempfile
 import uuid
 
@@ -34,7 +35,10 @@ from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_utils import excutils
 import paramiko
-from past.builtins import basestring
+
+if sys.version_info.major == 3:
+    from past.builtins import basestring
+
 import six
 
 from cloudpulse.common import exception
diff --git a/cloudpulse/conductor/cpulse_lock.py b/cloudpulse/conductor/cpulse_lock.py
index 69ea522..1b1ac69 100644
--- a/cloudpulse/conductor/cpulse_lock.py
+++ b/cloudpulse/conductor/cpulse_lock.py
@@ -16,7 +16,9 @@ from cloudpulse import objects
 import contextlib
 from oslo_log import log as logging
 from oslo_utils import excutils
-from past.builtins import xrange
+import sys
+if sys.version_info.major == 3:
+    from past.builtins import xrange
 import time
 
 LOG = logging.getLogger(__name__)