diff --git a/bowling_ball/rolling_tests.py b/bowling_ball/rolling_tests.py
index e1461295..a8ddd6e1 100755
--- a/bowling_ball/rolling_tests.py
+++ b/bowling_ball/rolling_tests.py
@@ -218,6 +218,20 @@ class CinderTest(ServiceTest):
         return msg
 
 
+class SwiftTest(ServiceTest):
+    service_name = 'swift'
+    description = 'Query for a list of containers'
+
+    def run(self):
+        containers = self.get_objects('object_store', 'containers')
+
+        msg = 'API reached, no containers found'
+        if containers:
+            msg = 'Container list received'
+
+        return msg
+
+
 class TestRunner(object):
     """Run a test in a loop, with the option to gracefully exit"""
     stop_now = False
@@ -311,6 +325,7 @@ available_tests = {
     'nova': NovaTest,
     'neutron': NeutronTest,
     'cinder': CinderTest,
+    'swift': SwiftTest,
 }