diff --git a/zaza/openstack/charm_tests/swift/tests.py b/zaza/openstack/charm_tests/swift/tests.py
index 75f82b7..62fe02c 100644
--- a/zaza/openstack/charm_tests/swift/tests.py
+++ b/zaza/openstack/charm_tests/swift/tests.py
@@ -104,16 +104,25 @@ class SwiftStorageTests(test_utils.OpenStackBaseTest):
         services = ['swift-account-server',
                     'swift-account-auditor',
                     'swift-account-reaper',
-                    'swift-account-replicator',
                     'swift-container-server',
                     'swift-container-auditor',
-                    'swift-container-replicator',
                     'swift-container-updater',
                     'swift-object-server',
                     'swift-object-auditor',
-                    'swift-object-replicator',
                     'swift-object-updater',
                     'swift-container-sync']
+
+        current_os_release = openstack_utils.get_os_release()
+        focal_victoria = openstack_utils.get_os_release('focal_victoria')
+        if current_os_release < focal_victoria:
+            services += ['swift-account-replicator',
+                         'swift-container-replicator',
+                         'swift-object-replicator']
+        else:
+            services += ['swift-account-server',
+                         'swift-container-server',
+                         'swift-object-server']
+
         with self.pause_resume(services):
             logging.info("Testing pause resume")