diff --git a/heat/api/cfn/v1/waitcondition.py b/heat/api/cfn/v1/waitcondition.py
index 7780c631b4..1be0d6c45a 100644
--- a/heat/api/cfn/v1/waitcondition.py
+++ b/heat/api/cfn/v1/waitcondition.py
@@ -20,7 +20,7 @@ from heat.api.aws import exception
 import heat.openstack.common.rpc.common as rpc_common
 
 
-class WaitConditionController:
+class WaitConditionController(object):
     def __init__(self, options):
         self.options = options
         self.engine = rpc_client.EngineClient()
diff --git a/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py
index 6676d24034..3a398d2b5d 100755
--- a/heat/cloudinit/loguserdata.py
+++ b/heat/cloudinit/loguserdata.py
@@ -42,7 +42,7 @@ def init_logging():
 
 def call(args):
 
-    class LogStream:
+    class LogStream(object):
 
         def write(self, data):
             LOG.info(data)
diff --git a/heat/tests/fakes.py b/heat/tests/fakes.py
index 0833f2fe06..17c754a54b 100644
--- a/heat/tests/fakes.py
+++ b/heat/tests/fakes.py
@@ -97,7 +97,7 @@ class FakeClient(object):
         pass
 
 
-class FakeKeystoneClient():
+class FakeKeystoneClient(object):
     def __init__(self, username='test_user', user_id='1234', access='4567',
                  secret='8901'):
         self.username = username
@@ -116,7 +116,7 @@ class FakeKeystoneClient():
     def get_ec2_keypair(self, user_id):
         if user_id == self.user_id:
             if not self.creds:
-                class FakeCred:
+                class FakeCred(object):
                     access = self.access
                     secret = self.secret
                 self.creds = FakeCred()
diff --git a/heat/tests/test_api_ec2token.py b/heat/tests/test_api_ec2token.py
index 96e9308ed6..373b18f3db 100644
--- a/heat/tests/test_api_ec2token.py
+++ b/heat/tests/test_api_ec2token.py
@@ -174,7 +174,7 @@ class Ec2TokenTest(HeatTestCase):
 
     def _stub_http_connection(self, headers={}, params={}, response=None):
 
-        class DummyHTTPResponse:
+        class DummyHTTPResponse(object):
             resp = response
 
             def read(self):
diff --git a/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py
index 1a8eaeb74e..d75621c7a2 100644
--- a/heat/tests/test_dbinstance.py
+++ b/heat/tests/test_dbinstance.py
@@ -72,11 +72,11 @@ class DBInstanceTest(HeatTestCase):
 
     def test_dbinstance(self):
 
-        class FakeDatabaseInstance:
+        class FakeDatabaseInstance(object):
             def _ipaddress(self):
                 return '10.0.0.1'
 
-        class FakeNested:
+        class FakeNested(object):
             resources = {'DatabaseInstance': FakeDatabaseInstance()}
 
         params = {'DBSecurityGroups': '',
diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index 182bf1e357..0ef899815d 100644
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -1262,7 +1262,7 @@ class StackServiceTest(HeatTestCase):
                                       state='NORMAL')
         self.wr.store()
 
-        class DummyAction:
+        class DummyAction(object):
             alarm = "dummyfoo"
 
         dummy_action = DummyAction()
diff --git a/heat/tests/test_loguserdata.py b/heat/tests/test_loguserdata.py
index 2998630854..1bbbb6a001 100644
--- a/heat/tests/test_loguserdata.py
+++ b/heat/tests/test_loguserdata.py
@@ -22,12 +22,12 @@ from heat.cloudinit import loguserdata
 from heat.tests.common import HeatTestCase
 
 
-class FakeCiVersion():
+class FakeCiVersion(object):
     def __init__(self, version=None):
         self.version = version
 
 
-class FakePOpen():
+class FakePOpen(object):
     def __init__(self, returncode=0):
         self.returncode = returncode
 
diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 5316be8dc1..b4306bbc32 100644
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -467,7 +467,7 @@ Mappings:
         deletion_policy_snippet = {'Fn::ResourceFacade': 'DeletionPolicy'}
         update_policy_snippet = {'Fn::ResourceFacade': 'UpdatePolicy'}
 
-        class DummyClass:
+        class DummyClass(object):
             pass
         parent_resource = DummyClass()
         parent_resource.metadata = '{"foo": "bar"}'
@@ -497,7 +497,7 @@ Mappings:
     def test_resource_facade_missing_key(self):
         snippet = {'Fn::ResourceFacade': 'DeletionPolicy'}
 
-        class DummyClass:
+        class DummyClass(object):
             pass
         parent_resource = DummyClass()
         parent_resource.metadata = '{"foo": "bar"}'
diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
index c289b69fd9..4ee12265d8 100644
--- a/heat/tests/test_volume.py
+++ b/heat/tests/test_volume.py
@@ -676,7 +676,7 @@ class VolumeTest(HeatTestCase):
         self.m.VerifyAll()
 
 
-class FakeVolume:
+class FakeVolume(object):
     status = 'attaching'
     id = 'vol-123'
 
diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py
index 4ba6e44f6c..e0732cab4d 100644
--- a/heat/tests/test_watch.py
+++ b/heat/tests/test_watch.py
@@ -26,14 +26,14 @@ from heat.tests import utils
 from heat.tests.utils import dummy_context
 
 
-class WatchData:
+class WatchData(object):
     def __init__(self, data, created_at):
         self.created_at = created_at
         self.data = {'test_metric': {'Value': data,
                                      'Unit': 'Count'}}
 
 
-class DummyAction:
+class DummyAction(object):
     alarm = "DummyAction"