diff --git a/backend/swift/swift_test.go b/backend/swift/swift_test.go
index 9f3d2d74f..d33e855b4 100644
--- a/backend/swift/swift_test.go
+++ b/backend/swift/swift_test.go
@@ -206,8 +206,8 @@ func (f *Fs) testPolicyDiscovery(t *testing.T) {
 	_, err = f.fetchStoragePolicy(ctx, container)
 	require.NoError(t, err)
 
-	// Default policy for Swift is Policy-0.
-	assert.Equal(t, "Policy-0", f.opt.StoragePolicy)
+	// Default policy for SAIO image is 1replica.
+	assert.Equal(t, "1replica", f.opt.StoragePolicy)
 
 	// Create a container using a non-default policy, and check to ensure
 	// that the created segments container uses the same non-default policy.
diff --git a/fstest/testserver/init.d/TestSwiftAIO b/fstest/testserver/init.d/TestSwiftAIO
index d46ad5029..7e20bd67c 100755
--- a/fstest/testserver/init.d/TestSwiftAIO
+++ b/fstest/testserver/init.d/TestSwiftAIO
@@ -11,8 +11,8 @@ start() {
     # We need to replace the remakerings in the container to create Policy-1.
     docker run --rm -d --name ${NAME} \
            -p 127.0.0.1:${PORT}:8080 \
-	   -v $(dirname "$0")/TestSwiftAIO.d/remakerings:/swift/bin/remakerings:ro \
-           bouncestorage/swift-aio
+	   -v $(dirname "$0")/TestSwiftAIO.d/remakerings:/etc/swift/remakerings:ro \
+           openstackswift/saio
 
     echo type=swift
     echo env_auth=false
diff --git a/fstest/testserver/init.d/TestSwiftAIO.d/remakerings b/fstest/testserver/init.d/TestSwiftAIO.d/remakerings
index 06785b3ab..27c49b17f 100755
--- a/fstest/testserver/init.d/TestSwiftAIO.d/remakerings
+++ b/fstest/testserver/init.d/TestSwiftAIO.d/remakerings
@@ -1,15 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 
-cd /etc/swift
-
-if ! grep storage-policy swift.conf; then
+if ! grep -q "^\[storage-policy:1\]" swift.conf; then
     cat <<EOF >> swift.conf
 
-# Policy-0 is the default, we need two policies to test policy inheritance.
-[storage-policy:0]
-name = Policy-0
-default = true
-
 [storage-policy:1]
 name = Policy-1
 EOF
@@ -18,16 +11,36 @@ fi
 rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz
 
 swift-ring-builder object.builder create 10 1 1
-swift-ring-builder object.builder add r1z1-127.0.0.1:6010/sdb1 1
+swift-ring-builder object.builder add r1z1-127.0.0.1:6200/swift-d0 1
+swift-ring-builder object.builder add r1z1-127.0.0.1:6200/swift-d1 1
+swift-ring-builder object.builder add r1z1-127.0.0.1:6200/swift-d2 1
+swift-ring-builder object.builder add r1z1-127.0.0.1:6200/swift-d3 1
+swift-ring-builder object.builder add r1z1-127.0.0.1:6200/swift-d4 1
+swift-ring-builder object.builder add r1z1-127.0.0.1:6200/swift-d5 1
 swift-ring-builder object.builder rebalance
 swift-ring-builder container.builder create 10 1 1
-swift-ring-builder container.builder add r1z1-127.0.0.1:6011/sdb1 1
+swift-ring-builder container.builder add r1z1-127.0.0.1:6201/swift-d0 1
+swift-ring-builder container.builder add r1z1-127.0.0.1:6201/swift-d1 1
+swift-ring-builder container.builder add r1z1-127.0.0.1:6201/swift-d2 1
+swift-ring-builder container.builder add r1z1-127.0.0.1:6201/swift-d3 1
+swift-ring-builder container.builder add r1z1-127.0.0.1:6201/swift-d4 1
+swift-ring-builder container.builder add r1z1-127.0.0.1:6201/swift-d5 1
 swift-ring-builder container.builder rebalance
 swift-ring-builder account.builder create 10 1 1
-swift-ring-builder account.builder add r1z1-127.0.0.1:6012/sdb1 1
+swift-ring-builder account.builder add r1z1-127.0.0.1:6202/swift-d0 1
+swift-ring-builder account.builder add r1z1-127.0.0.1:6202/swift-d1 1
+swift-ring-builder account.builder add r1z1-127.0.0.1:6202/swift-d2 1
+swift-ring-builder account.builder add r1z1-127.0.0.1:6202/swift-d3 1
+swift-ring-builder account.builder add r1z1-127.0.0.1:6202/swift-d4 1
+swift-ring-builder account.builder add r1z1-127.0.0.1:6202/swift-d5 1
 swift-ring-builder account.builder rebalance
 
 # For Policy-1:
 swift-ring-builder object-1.builder create 10 1 1
-swift-ring-builder object-1.builder add r1z1-127.0.0.1:6010/sdb1 1
+swift-ring-builder object-1.builder add r1z1-127.0.0.1:6200/swift-d0 1
+swift-ring-builder object-1.builder add r1z1-127.0.0.1:6200/swift-d1 1
+swift-ring-builder object-1.builder add r1z1-127.0.0.1:6200/swift-d2 1
+swift-ring-builder object-1.builder add r1z1-127.0.0.1:6200/swift-d3 1
+swift-ring-builder object-1.builder add r1z1-127.0.0.1:6200/swift-d4 1
+swift-ring-builder object-1.builder add r1z1-127.0.0.1:6200/swift-d5 1
 swift-ring-builder object-1.builder rebalance
diff --git a/fstest/testserver/init.d/TestSwiftAIOsegments b/fstest/testserver/init.d/TestSwiftAIOsegments
index 197487bcc..db02630ee 100755
--- a/fstest/testserver/init.d/TestSwiftAIOsegments
+++ b/fstest/testserver/init.d/TestSwiftAIOsegments
@@ -8,9 +8,11 @@ PORT=28632
 . $(dirname "$0")/docker.bash
 
 start() {
+    # We need to replace the remakerings in the container to create Policy-1.
     docker run --rm -d --name ${NAME} \
            -p 127.0.0.1:${PORT}:8080 \
-           bouncestorage/swift-aio
+	   -v $(dirname "$0")/TestSwiftAIO.d/remakerings:/etc/swift/remakerings:ro \
+           openstackswift/saio
     
     echo type=swift
     echo env_auth=false