diff --git a/swift/account/backend.py b/swift/account/backend.py
index 0500c4f6de..3e3947f565 100644
--- a/swift/account/backend.py
+++ b/swift/account/backend.py
@@ -18,7 +18,7 @@ Pluggable Back-end for Account Server
 
 from uuid import uuid4
 import time
-import cPickle as pickle
+import six.moves.cPickle as pickle
 
 import sqlite3
 
diff --git a/swift/common/db.py b/swift/common/db.py
index 80a855ac1c..aa92c85fca 100644
--- a/swift/common/db.py
+++ b/swift/common/db.py
@@ -23,7 +23,7 @@ from uuid import uuid4
 import sys
 import time
 import errno
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from swift import gettext_ as _
 from tempfile import mkstemp
 
diff --git a/swift/common/memcached.py b/swift/common/memcached.py
index 0a2971ac8d..f4467cb6e4 100644
--- a/swift/common/memcached.py
+++ b/swift/common/memcached.py
@@ -44,7 +44,7 @@ version is at:
 http://github.com/memcached/memcached/blob/1.4.2/doc/protocol.txt
 """
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import logging
 import time
 from bisect import bisect
diff --git a/swift/common/ring/builder.py b/swift/common/ring/builder.py
index d161bb5561..1294445797 100644
--- a/swift/common/ring/builder.py
+++ b/swift/common/ring/builder.py
@@ -20,7 +20,7 @@ import itertools
 import logging
 import math
 import random
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from copy import deepcopy
 
 from array import array
diff --git a/swift/common/ring/ring.py b/swift/common/ring/ring.py
index 861eccbf84..c62015fa3d 100644
--- a/swift/common/ring/ring.py
+++ b/swift/common/ring/ring.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import array
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import inspect
 from collections import defaultdict
 from gzip import GzipFile
diff --git a/swift/common/utils.py b/swift/common/utils.py
index 2cb1980350..4e65eb6c0c 100644
--- a/swift/common/utils.py
+++ b/swift/common/utils.py
@@ -47,7 +47,7 @@ try:
     import simplejson as json
 except ImportError:
     import json
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import glob
 from urlparse import urlparse as stdlib_urlparse, ParseResult
 import itertools
diff --git a/swift/container/backend.py b/swift/container/backend.py
index 7aad12dd2f..c878edfa88 100644
--- a/swift/container/backend.py
+++ b/swift/container/backend.py
@@ -19,7 +19,7 @@ Pluggable Back-ends for Container Server
 import os
 from uuid import uuid4
 import time
-import cPickle as pickle
+import six.moves.cPickle as pickle
 
 from six.moves import range
 import sqlite3
diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py
index 252df42a51..c8f83b24ef 100644
--- a/swift/obj/diskfile.py
+++ b/swift/obj/diskfile.py
@@ -30,7 +30,7 @@ The remaining methods in this module are considered implementation specific and
 are also not considered part of the backend API.
 """
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import errno
 import fcntl
 import os
diff --git a/swift/obj/reconstructor.py b/swift/obj/reconstructor.py
index 8f84b06c7a..77a8a0161b 100644
--- a/swift/obj/reconstructor.py
+++ b/swift/obj/reconstructor.py
@@ -19,7 +19,7 @@ import random
 import time
 import itertools
 from collections import defaultdict
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import shutil
 
 from eventlet import (GreenPile, GreenPool, Timeout, sleep, hubs, tpool,
diff --git a/swift/obj/replicator.py b/swift/obj/replicator.py
index de2ec8d85f..bc6b44fbff 100644
--- a/swift/obj/replicator.py
+++ b/swift/obj/replicator.py
@@ -20,7 +20,7 @@ import random
 import shutil
 import time
 import itertools
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from swift import gettext_ as _
 
 import eventlet
diff --git a/swift/obj/server.py b/swift/obj/server.py
index 97424cf787..1542383a9f 100644
--- a/swift/obj/server.py
+++ b/swift/obj/server.py
@@ -15,7 +15,7 @@
 
 """ Object Server for Swift """
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import json
 import os
 import multiprocessing
diff --git a/swift/obj/updater.py b/swift/obj/updater.py
index f5d1f37fa4..a07a72be9b 100644
--- a/swift/obj/updater.py
+++ b/swift/obj/updater.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import os
 import signal
 import sys
diff --git a/test/unit/__init__.py b/test/unit/__init__.py
index a5d77062fe..17ab2c3f0c 100644
--- a/test/unit/__init__.py
+++ b/test/unit/__init__.py
@@ -41,7 +41,7 @@ from httplib import HTTPException
 from swift.common import storage_policy
 from swift.common.storage_policy import StoragePolicy, ECStoragePolicy
 import functools
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from gzip import GzipFile
 import mock as mocklib
 import inspect
diff --git a/test/unit/common/ring/test_builder.py b/test/unit/common/ring/test_builder.py
index 769937b6e6..e0a6f6762e 100644
--- a/test/unit/common/ring/test_builder.py
+++ b/test/unit/common/ring/test_builder.py
@@ -19,7 +19,7 @@ import mock
 import operator
 import os
 import unittest
-import cPickle as pickle
+import six.moves.cPickle as pickle
 from array import array
 from collections import defaultdict
 from math import ceil
diff --git a/test/unit/common/ring/test_ring.py b/test/unit/common/ring/test_ring.py
index 0e0cfe567c..05e13c91cb 100644
--- a/test/unit/common/ring/test_ring.py
+++ b/test/unit/common/ring/test_ring.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import array
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import os
 import sys
 import unittest
diff --git a/test/unit/common/test_db.py b/test/unit/common/test_db.py
index 6e0606e79d..c4344626e8 100644
--- a/test/unit/common/test_db.py
+++ b/test/unit/common/test_db.py
@@ -21,7 +21,7 @@ import unittest
 from tempfile import mkdtemp
 from shutil import rmtree, copy
 from uuid import uuid4
-import cPickle as pickle
+import six.moves.cPickle as pickle
 
 import simplejson
 import sqlite3
diff --git a/test/unit/container/test_updater.py b/test/unit/container/test_updater.py
index 0b3d33c56c..4b5a1c591b 100644
--- a/test/unit/container/test_updater.py
+++ b/test/unit/container/test_updater.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import mock
 import os
 import unittest
diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py
index c184ffc581..222b0a93f1 100644
--- a/test/unit/obj/test_diskfile.py
+++ b/test/unit/obj/test_diskfile.py
@@ -16,7 +16,7 @@
 
 """Tests for swift.obj.diskfile"""
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import os
 import errno
 import itertools
diff --git a/test/unit/obj/test_reconstructor.py b/test/unit/obj/test_reconstructor.py
index a52e64bd1a..16ab228818 100755
--- a/test/unit/obj/test_reconstructor.py
+++ b/test/unit/obj/test_reconstructor.py
@@ -17,7 +17,7 @@ import unittest
 import os
 from hashlib import md5
 import mock
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import tempfile
 import time
 import shutil
diff --git a/test/unit/obj/test_replicator.py b/test/unit/obj/test_replicator.py
index 08eb88b9aa..6217af641f 100644
--- a/test/unit/obj/test_replicator.py
+++ b/test/unit/obj/test_replicator.py
@@ -18,7 +18,7 @@ import os
 import mock
 from gzip import GzipFile
 from shutil import rmtree
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import time
 import tempfile
 from contextlib import contextmanager, closing
diff --git a/test/unit/obj/test_server.py b/test/unit/obj/test_server.py
index d0a6865a4c..a66609c5ef 100755
--- a/test/unit/obj/test_server.py
+++ b/test/unit/obj/test_server.py
@@ -16,7 +16,7 @@
 
 """Tests for swift.obj.server"""
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import datetime
 import json
 import errno
diff --git a/test/unit/obj/test_updater.py b/test/unit/obj/test_updater.py
index 10b7d809a4..2ba239c854 100644
--- a/test/unit/obj/test_updater.py
+++ b/test/unit/obj/test_updater.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import cPickle as pickle
+import six.moves.cPickle as pickle
 import mock
 import os
 import unittest