diff --git a/requirements.txt b/requirements.txt
index 1c5587bdbe..92d8e7cdca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,3 +18,4 @@ python-swiftclient>=1.6
 python-keystoneclient>=0.4.2
 PrettyTable>=0.6,<0.8
 babel
+six>=1.6.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 875a821af1..34a7a6bac6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,6 @@ docutils==0.9.1
 discover
 fixtures>=0.3.14
 python-subunit
-six>=1.4.1
 testrepository>=0.0.17
 testtools>=0.9.32
 sphinxcontrib-programoutput
diff --git a/zuul/lib/swift.py b/zuul/lib/swift.py
index 8f926adf81..ac533bc53c 100644
--- a/zuul/lib/swift.py
+++ b/zuul/lib/swift.py
@@ -17,6 +17,7 @@ from hashlib import sha1
 from time import time
 import os
 import random
+import six
 import string
 import swiftclient
 import urlparse
@@ -116,7 +117,7 @@ class Swift(object):
             'file_path_prefix': ''
         }
 
-        for key, default in settings.iteritems():
+        for key, default in six.iteritems(settings):
             if key in kwargs:
                 settings[key] = kwargs[key]
             elif self.config.has_option('swift', 'default_' + key):
diff --git a/zuul/rpclistener.py b/zuul/rpclistener.py
index a5a5b5de28..8719c76fb7 100644
--- a/zuul/rpclistener.py
+++ b/zuul/rpclistener.py
@@ -19,6 +19,7 @@ import threading
 import traceback
 
 import gear
+import six
 
 import model
 
@@ -129,7 +130,8 @@ class RPCListener(object):
         # args = json.loads(job.arguments)
         # TODO: use args to filter by pipeline etc
         running_items = []
-        for pipeline_name, pipeline in self.sched.layout.pipelines.iteritems():
+        for pipeline_name, pipeline in six.iteritems(
+                self.sched.layout.pipelines):
             for queue in pipeline.queues:
                 for item in queue.queue:
                     running_items.append(item.formatJSON())