diff --git a/requirements.txt b/requirements.txt
index 98057432..a7b73448 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,6 +31,7 @@ python-ironicclient>=0.2.1
 python-saharaclient>=0.7.6
 python-troveclient>=1.0.7
 python-zaqarclient>=0.0.3
+python-swiftclient>=2.2.0
 python-subunit>=0.0.18
 requests>=2.2.0,!=2.4.0
 SQLAlchemy>=0.9.7,<=0.9.99
diff --git a/tests/unit/fakes.py b/tests/unit/fakes.py
index f41c119d..dc2bf58a 100644
--- a/tests/unit/fakes.py
+++ b/tests/unit/fakes.py
@@ -25,6 +25,7 @@ import mock
 from neutronclient.common import exceptions as neutron_exceptions
 from novaclient import exceptions as nova_exceptions
 import six
+from swiftclient import exceptions as swift_exceptions
 
 from rally.benchmark.context import base as base_ctx
 from rally.benchmark.scenarios import base
@@ -285,6 +286,10 @@ class FakeWorkbook(FakeResource):
         self.workbook = mock.MagicMock()
 
 
+class FakeObject(FakeResource):
+    pass
+
+
 class FakeManager(object):
 
     def __init__(self):
@@ -824,6 +829,49 @@ class FakeWorkbookManager(FakeManager):
         return [self.workbook]
 
 
+class FakeObjectManager(FakeManager):
+
+    def get_account(self, **kwargs):
+        containers = self.list()
+        return (mock.MagicMock(), [{"name": con.name} for con in containers])
+
+    def get_container(self, name, **kwargs):
+        container = self.find(name=name)
+        if container is None:
+            raise swift_exceptions.ClientException("Container GET failed")
+        return (mock.MagicMock(), [{"name": obj} for obj in container.items])
+
+    def put_container(self, name, **kwargs):
+        if self.find(name=name):
+            raise swift_exceptions.ClientException("Container PUT failed")
+        self._cache(FakeObject(name=name))
+
+    def delete_container(self, name, **kwargs):
+        container = self.find(name=name)
+        if container is None or len(container.items.keys()) > 0:
+            raise swift_exceptions.ClientException("Container DELETE failed")
+        self.delete(container.uuid)
+
+    def get_object(self, container_name, object_name, **kwargs):
+        container = self.find(name=container_name)
+        if container is None or object_name not in container.items:
+            raise swift_exceptions.ClientException("Object GET failed")
+        return (mock.MagicMock(), container.items[object_name])
+
+    def put_object(self, container_name, object_name, content, **kwargs):
+        container = self.find(name=container_name)
+        if container is None or object_name in container.items:
+            raise swift_exceptions.ClientException("Object PUT failed")
+        container.items[object_name] = content
+        return mock.MagicMock()
+
+    def delete_object(self, container_name, object_name, **kwargs):
+        container = self.find(name=container_name)
+        if container is None or object_name not in container.items:
+            raise swift_exceptions.ClientException("Object DELETE failed")
+        del container.items[object_name]
+
+
 class FakeServiceCatalog(object):
     def get_endpoints(self):
         return {"image": [{"publicURL": "http://fake.to"}],
@@ -1212,6 +1260,10 @@ class FakeMistralClient(object):
         self.workbook = FakeWorkbookManager()
 
 
+class FakeSwiftClient(FakeObjectManager):
+    pass
+
+
 class FakeClients(object):
 
     def __init__(self, endpoint_=None):
@@ -1227,6 +1279,7 @@ class FakeClients(object):
         self._zaqar = None
         self._trove = None
         self._mistral = None
+        self._swift = None
         self._endpoint = endpoint_ or objects.Endpoint(
             "http://fake.example.org:5000/v2.0/",
             "fake_username",
@@ -1296,6 +1349,11 @@ class FakeClients(object):
             self._mistral = FakeMistralClient()
         return self._mistral
 
+    def swift(self):
+        if not self._swift:
+            self._swift = FakeSwiftClient()
+        return self._swift
+
 
 class FakeRunner(object):