diff --git a/src/restic/backend/layout_test.go b/src/restic/backend/layout_test.go
index 11e33ca98..cd06d4e63 100644
--- a/src/restic/backend/layout_test.go
+++ b/src/restic/backend/layout_test.go
@@ -301,8 +301,8 @@ func TestDetectLayout(t *testing.T) {
 		filename string
 		want     string
 	}{
-		{"repo-layout-local.tar.gz", "*backend.DefaultLayout"},
-		{"repo-layout-s3-old.tar.gz", "*backend.S3LegacyLayout"},
+		{"repo-layout-default.tar.gz", "*backend.DefaultLayout"},
+		{"repo-layout-s3legacy.tar.gz", "*backend.S3LegacyLayout"},
 	}
 
 	var fs = &LocalFilesystem{}
@@ -345,7 +345,7 @@ func TestParseLayout(t *testing.T) {
 		{"", "", "*backend.DefaultLayout"},
 	}
 
-	SetupTarTestFixture(t, path, filepath.Join("testdata", "repo-layout-local.tar.gz"))
+	SetupTarTestFixture(t, path, filepath.Join("testdata", "repo-layout-default.tar.gz"))
 
 	for _, test := range tests {
 		t.Run(test.layoutName, func(t *testing.T) {
diff --git a/src/restic/backend/local/layout_test.go b/src/restic/backend/local/layout_test.go
index c5b9427a8..16b6b16e3 100644
--- a/src/restic/backend/local/layout_test.go
+++ b/src/restic/backend/local/layout_test.go
@@ -17,12 +17,12 @@ func TestLayout(t *testing.T) {
 		failureExpected bool
 		datafiles       map[string]bool
 	}{
-		{"repo-layout-local.tar.gz", "", false, map[string]bool{
+		{"repo-layout-default.tar.gz", "", false, map[string]bool{
 			"aa464e9fd598fe4202492ee317ffa728e82fa83a1de1a61996e5bd2d6651646c": false,
 			"fc919a3b421850f6fa66ad22ebcf91e433e79ffef25becf8aef7c7b1eca91683": false,
 			"c089d62788da14f8b7cbf77188305c0874906f0b73d3fce5a8869050e8d0c0e1": false,
 		}},
-		{"repo-layout-s3-old.tar.gz", "", false, map[string]bool{
+		{"repo-layout-s3legacy.tar.gz", "", false, map[string]bool{
 			"fc919a3b421850f6fa66ad22ebcf91e433e79ffef25becf8aef7c7b1eca91683": false,
 			"c089d62788da14f8b7cbf77188305c0874906f0b73d3fce5a8869050e8d0c0e1": false,
 			"aa464e9fd598fe4202492ee317ffa728e82fa83a1de1a61996e5bd2d6651646c": false,
diff --git a/src/restic/backend/sftp/layout_test.go b/src/restic/backend/sftp/layout_test.go
index 196dcdeba..166fa97e3 100644
--- a/src/restic/backend/sftp/layout_test.go
+++ b/src/restic/backend/sftp/layout_test.go
@@ -23,12 +23,12 @@ func TestLayout(t *testing.T) {
 		failureExpected bool
 		datafiles       map[string]bool
 	}{
-		{"repo-layout-local.tar.gz", "", false, map[string]bool{
+		{"repo-layout-default.tar.gz", "", false, map[string]bool{
 			"aa464e9fd598fe4202492ee317ffa728e82fa83a1de1a61996e5bd2d6651646c": false,
 			"fc919a3b421850f6fa66ad22ebcf91e433e79ffef25becf8aef7c7b1eca91683": false,
 			"c089d62788da14f8b7cbf77188305c0874906f0b73d3fce5a8869050e8d0c0e1": false,
 		}},
-		{"repo-layout-s3-old.tar.gz", "", false, map[string]bool{
+		{"repo-layout-s3legacy.tar.gz", "", false, map[string]bool{
 			"fc919a3b421850f6fa66ad22ebcf91e433e79ffef25becf8aef7c7b1eca91683": false,
 			"c089d62788da14f8b7cbf77188305c0874906f0b73d3fce5a8869050e8d0c0e1": false,
 			"aa464e9fd598fe4202492ee317ffa728e82fa83a1de1a61996e5bd2d6651646c": false,
diff --git a/src/restic/backend/testdata/repo-layout-local.tar.gz b/src/restic/backend/testdata/repo-layout-default.tar.gz
similarity index 100%
rename from src/restic/backend/testdata/repo-layout-local.tar.gz
rename to src/restic/backend/testdata/repo-layout-default.tar.gz
diff --git a/src/restic/backend/testdata/repo-layout-s3-old.tar.gz b/src/restic/backend/testdata/repo-layout-s3legacy.tar.gz
similarity index 100%
rename from src/restic/backend/testdata/repo-layout-s3-old.tar.gz
rename to src/restic/backend/testdata/repo-layout-s3legacy.tar.gz