diff --git a/glance/artifacts/domain/proxy.py b/glance/artifacts/domain/proxy.py
index de4b096567..35591be5d3 100644
--- a/glance/artifacts/domain/proxy.py
+++ b/glance/artifacts/domain/proxy.py
@@ -14,8 +14,6 @@
 
 import collections
 
-import six
-
 from glance.common import exception as exc
 from glance.domain import proxy as image_proxy
 
@@ -42,7 +40,7 @@ class ArtifactHelper(image_proxy.Helper):
         if not hasattr(obj, 'metadata'):
             return super(ArtifactHelper, self).proxy(obj)
         extra_attrs = {}
-        for att_name in six.iterkeys(obj.metadata.attributes.all):
+        for att_name in obj.metadata.attributes.all.keys():
             extra_attrs[att_name] = _proxy_artifact_property(att_name)
         new_proxy_class = type("%s(%s)" % (obj.metadata.type_name,
                                            self.proxy_class.__module__),
diff --git a/tools/colorizer.py b/tools/colorizer.py
index ad4f898386..66f8c8a3d7 100755
--- a/tools/colorizer.py
+++ b/tools/colorizer.py
@@ -271,7 +271,7 @@ class SubunitTestResult(testtools.TestResult):
         self.stopTestRun()
 
     def stopTestRun(self):
-        for cls in list(self.results.iterkeys()):
+        for cls in list(self.results.keys()):
             self.writeTestCase(cls)
         self.stream.writeln()
         self.writeSlowTests()