diff --git a/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py
index fa8ac8634d..e55e31d9d9 100755
--- a/heat/cloudinit/loguserdata.py
+++ b/heat/cloudinit/loguserdata.py
@@ -24,7 +24,7 @@ def init_logging():
     LOG.setLevel(logging.INFO)
     LOG.addHandler(logging.StreamHandler())
     fh = logging.FileHandler("/var/log/heat-provision.log")
-    os.chmod(fh.baseFilename, 0600)
+    os.chmod(fh.baseFilename, 0o600)
     LOG.addHandler(fh)
 
 
@@ -65,7 +65,7 @@ def main():
         return -1
 
     userdata_path = os.path.join(VAR_PATH, 'cfn-userdata')
-    os.chmod(userdata_path, 0700)
+    os.chmod(userdata_path, 0o700)
 
     LOG.info('Provision began: %s\n' % datetime.datetime.now())
     returncode = call([userdata_path])
diff --git a/heat/cloudinit/part-handler.py b/heat/cloudinit/part-handler.py
index 4b1c6b5752..e7794a174b 100644
--- a/heat/cloudinit/part-handler.py
+++ b/heat/cloudinit/part-handler.py
@@ -12,7 +12,7 @@ def list_types():
 def handle_part(data, ctype, filename, payload):
     if ctype == "__begin__":
         try:
-            os.makedirs('/var/lib/heat-cfntools', 0700)
+            os.makedirs('/var/lib/heat-cfntools', 0o700)
         except OSError as e:
             if e.errno != errno.EEXIST:
                 raise
diff --git a/heat/tests/test_loguserdata.py b/heat/tests/test_loguserdata.py
index da2acb20c8..2998630854 100644
--- a/heat/tests/test_loguserdata.py
+++ b/heat/tests/test_loguserdata.py
@@ -87,7 +87,7 @@ class LoguserdataTest(HeatTestCase):
         pkg_resources.get_distribution('cloud-init').AndReturn(
             FakeCiVersion('0.7.0'))
 
-        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0700).AndReturn(None)
+        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None)
         subprocess.Popen(
             ['/var/lib/heat-cfntools/cfn-userdata'],
             stderr=mox.IgnoreArg(),
@@ -102,7 +102,7 @@ class LoguserdataTest(HeatTestCase):
         pkg_resources.get_distribution('cloud-init').AndReturn(
             FakeCiVersion('0.7.0'))
 
-        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0700).AndReturn(None)
+        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None)
         subprocess.Popen(
             ['/var/lib/heat-cfntools/cfn-userdata'],
             stderr=mox.IgnoreArg(),
@@ -119,7 +119,7 @@ class LoguserdataTest(HeatTestCase):
         pkg_resources.get_distribution('cloud-init').AndReturn(
             FakeCiVersion('0.7.0'))
 
-        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0700).AndReturn(None)
+        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None)
         subprocess.Popen(
             ['/var/lib/heat-cfntools/cfn-userdata'],
             stderr=mox.IgnoreArg(),
@@ -134,7 +134,7 @@ class LoguserdataTest(HeatTestCase):
     def test_main_error_other(self):
         pkg_resources.get_distribution('cloud-init').AndReturn(
             FakeCiVersion('0.7.0'))
-        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0700).AndReturn(None)
+        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None)
         subprocess.Popen(
             ['/var/lib/heat-cfntools/cfn-userdata'],
             stderr=mox.IgnoreArg(),
@@ -153,7 +153,7 @@ class LoguserdataTest(HeatTestCase):
         pkg_resources.get_distribution('cloud-init').AndReturn(
             FakeCiVersion('0.7.0'))
 
-        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0700).AndReturn(None)
+        os.chmod('/var/lib/heat-cfntools/cfn-userdata', 0o700).AndReturn(None)
         subprocess.Popen(
             ['/var/lib/heat-cfntools/cfn-userdata'],
             stderr=mox.IgnoreArg(),