diff --git a/.gitignore b/.gitignore
index 82a3d66dc..bbfd45d07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,18 @@
 .tool-versions
 /out
 .vscode
+
 acceptance/testdata/*/**/container/cnb/lifecycle/*
 acceptance/testdata/*/**/container/docker-config/*
+
 acceptance/testdata/exporter/container/cnb/run.toml
 acceptance/testdata/exporter/container/layers/*analyzed.toml
 acceptance/testdata/exporter/container/other_layers/*analyzed.toml
+
 acceptance/testdata/restorer/container/layers/*analyzed.toml
+
+acceptance/testdata/rebaser/container/cnb/run.toml
+acceptance/testdata/rebaser/container/layers/analyzed.toml
+acceptance/testdata/rebaser/container/layers/run-image-extended-analyzed.toml
+acceptance/testdata/rebaser/container/layers/some-analyzed.toml
+acceptance/testdata/rebaser/container/other_layers/analyzed.toml
diff --git a/acceptance/testdata/rebaser/container/cnb/run.toml b/acceptance/testdata/rebaser/container/cnb/run.toml
deleted file mode 100644
index 05376bb91..000000000
--- a/acceptance/testdata/rebaser/container/cnb/run.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[images]]
-  image = "192.168.18.12:53689/some-read-only-run-image-asurginomp"
-  mirrors = ["mirror1", "mirror2"]
diff --git a/acceptance/testdata/rebaser/container/layers/analyzed.toml b/acceptance/testdata/rebaser/container/layers/analyzed.toml
deleted file mode 100644
index 6dd13579b..000000000
--- a/acceptance/testdata/rebaser/container/layers/analyzed.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[metadata]
-  [metadata.config]
-    sha = ""
-  [metadata.launcher]
-    sha = ""
-  [metadata.process-types]
-    sha = ""
-  [metadata.run-image]
-    top-layer = ""
-    reference = ""
-
-[run-image]
-  reference = "192.168.18.12:53689/some-read-only-run-image-asurginomp"
diff --git a/acceptance/testdata/rebaser/container/layers/run-image-extended-analyzed.toml b/acceptance/testdata/rebaser/container/layers/run-image-extended-analyzed.toml
deleted file mode 100644
index 91a6bd613..000000000
--- a/acceptance/testdata/rebaser/container/layers/run-image-extended-analyzed.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[metadata]
-  [metadata.config]
-    sha = ""
-  [metadata.launcher]
-    sha = ""
-  [metadata.process-types]
-    sha = ""
-  [metadata.run-image]
-    top-layer = ""
-    reference = ""
-
-[run-image]
-  reference = "192.168.18.12:53689/some-read-only-run-image-asurginomp"
-  extend = true
diff --git a/acceptance/testdata/rebaser/container/layers/some-analyzed.toml b/acceptance/testdata/rebaser/container/layers/some-analyzed.toml
deleted file mode 100644
index ad6901534..000000000
--- a/acceptance/testdata/rebaser/container/layers/some-analyzed.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-[image]
-  reference = "REPLACE"
-
-[metadata]
-
-  [[metadata.buildpacks]]
-    key = "some-buildpack-id"
-    version = ""
-    [metadata.buildpacks.layers]
-      [metadata.buildpacks.layers.launch-build-cache-layer]
-        sha = "launch-build-cache-sha"
-        build = true
-        launch = true
-        cache = true
-      [metadata.buildpacks.layers.launch-build-layer]
-        sha = "launch-build-sha"
-        build = true
-        launch = true
-        cache = false
-      [metadata.buildpacks.layers.launch-cache-layer]
-        sha = "launch-cache-sha"
-        build = false
-        launch = true
-        cache = true
-      [metadata.buildpacks.layers.launch-false-layer]
-        sha = "launch-false-sha"
-        build = false
-        launch = false
-        cache = false
-      [metadata.buildpacks.layers.launch-layer]
-        sha = "launch-sha"
-        build = false
-        launch = true
-        cache = false
-    [metadata.buildpacks.store]
-      [metadata.buildpacks.store.metadata]
-        [metadata.buildpacks.store.metadata.metadata-buildpack-store-data]
-          store-key = "store-val"
-  [metadata.config]
-    sha = ""
-  [metadata.launcher]
-    sha = ""
-  [metadata.process-types]
-    sha = ""
-  [metadata.run-image]
-    top-layer = ""
-    reference = ""
-
-[run-image]
-  reference = "192.168.18.12:53689/some-read-only-run-image-asurginomp"
diff --git a/acceptance/testdata/rebaser/container/other_layers/analyzed.toml b/acceptance/testdata/rebaser/container/other_layers/analyzed.toml
deleted file mode 100644
index 6dd13579b..000000000
--- a/acceptance/testdata/rebaser/container/other_layers/analyzed.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[metadata]
-  [metadata.config]
-    sha = ""
-  [metadata.launcher]
-    sha = ""
-  [metadata.process-types]
-    sha = ""
-  [metadata.run-image]
-    top-layer = ""
-    reference = ""
-
-[run-image]
-  reference = "192.168.18.12:53689/some-read-only-run-image-asurginomp"