diff --git a/Makefile b/Makefile
index bdebeb692..5dd54a163 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,15 @@ build_stacker = go build -tags "$(BUILD_TAGS) $1" -ldflags "-X main.version=$(VE
 STACKER_DOCKER_BASE?=docker://ghcr.io/project-stacker/
 # They default to their image name in STACKER_DOCKER_BASE
 STACKER_BUILD_BASE_IMAGE?=$(STACKER_DOCKER_BASE)alpine:edge
+STACKER_BUILD_BUSYBOX_IMAGE?=$(STACKER_DOCKER_BASE)busybox:latest
 STACKER_BUILD_CENTOS_IMAGE?=$(STACKER_DOCKER_BASE)centos:latest
 STACKER_BUILD_UBUNTU_IMAGE?=$(STACKER_DOCKER_BASE)ubuntu:latest
-STACKER_BUILD_IMAGES = $(STACKER_BUILD_BASE_IMAGE) $(STACKER_BUILD_CENTOS_IMAGE) $(STACKER_BUILD_UBUNTU_IMAGE)
+STACKER_BUILD_IMAGES = \
+	$(STACKER_BUILD_BASE_IMAGE) \
+	$(STACKER_BUILD_BUSYBOX_IMAGE) \
+	$(STACKER_BUILD_CENTOS_IMAGE) \
+	$(STACKER_BUILD_UBUNTU_IMAGE)
+
 LXC_CLONE_URL?=https://github.com/lxc/lxc
 LXC_BRANCH?=stable-5.0
 
@@ -128,6 +134,7 @@ test: stacker $(REGCLIENT) $(SKOPEO) $(ZOT)
 		LXC_BRANCH=$(LXC_BRANCH) \
 		LXC_CLONE_URL=$(LXC_CLONE_URL) \
 		STACKER_BUILD_BASE_IMAGE=$(STACKER_BUILD_BASE_IMAGE) \
+		STACKER_BUILD_BUSYBOX_IMAGE=$(STACKER_BUILD_BUSYBOX_IMAGE) \
 		STACKER_BUILD_CENTOS_IMAGE=$(STACKER_BUILD_CENTOS_IMAGE) \
 		STACKER_BUILD_UBUNTU_IMAGE=$(STACKER_BUILD_UBUNTU_IMAGE) \
 		./test/main.py \
diff --git a/test/annotations-namespace.bats b/test/annotations-namespace.bats
index d82102796..e9f2ae009 100644
--- a/test/annotations-namespace.bats
+++ b/test/annotations-namespace.bats
@@ -13,7 +13,7 @@ function teardown() {
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: ls
 EOF
     stacker build --annotations-namespace=namespace.example
@@ -28,7 +28,7 @@ EOF
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: ls
 EOF
     stacker build
diff --git a/test/annotations.bats b/test/annotations.bats
index 82feba6af..810250174 100644
--- a/test/annotations.bats
+++ b/test/annotations.bats
@@ -13,7 +13,7 @@ function teardown() {
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: ls
     annotations:
       a.b.c.key: val
diff --git a/test/args.bats b/test/args.bats
index f987491de..004a814f0 100644
--- a/test/args.bats
+++ b/test/args.bats
@@ -13,7 +13,7 @@ function teardown() {
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 child:
     from:
         type: built
diff --git a/test/asterisk.bats b/test/asterisk.bats
index 39abb1224..39e424099 100644
--- a/test/asterisk.bats
+++ b/test/asterisk.bats
@@ -13,7 +13,7 @@ function teardown() {
 a:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         mkdir /mybin
         cp /bin/* /mybin
diff --git a/test/atomfs.bats b/test/atomfs.bats
index 2c05a5023..8215af971 100644
--- a/test/atomfs.bats
+++ b/test/atomfs.bats
@@ -16,7 +16,7 @@ function basic_test() {
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /hello
 EOF
@@ -48,7 +48,7 @@ EOF
 base:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: touch /base
 a:
     from:
@@ -105,7 +105,7 @@ EOF
 
     # c should still be ok
     [ -f c/c ]
-    [ -f c/sbin/init ]
+    [ -f c/bin/sh ]
     stacker internal-go atomfs umount c
 
     # c's last layer shouldn't exist any more, since it is unique
@@ -121,7 +121,7 @@ EOF
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /hello
 EOF
diff --git a/test/basic.bats b/test/basic.bats
index dbf496e70..70414df9d 100644
--- a/test/basic.bats
+++ b/test/basic.bats
@@ -10,10 +10,10 @@ function teardown() {
 
 @test "multiple stacker builds in a row" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import: import
 EOF
     echo 1 > import
@@ -28,10 +28,10 @@ EOF
 
 @test "basic workings" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: tar
-        url: .stacker/layer-bases/centos.tar
+        url: .stacker/layer-bases/busybox.tar
     import:
         - ./stacker.yaml
         - https://www.cisco.com/favicon.ico
@@ -53,7 +53,7 @@ centos:
 layer1:
     from:
         type: built
-        tag: centos
+        tag: busybox
     run:
         - rm /favicon.ico
 EOF
@@ -62,29 +62,29 @@ EOF
     chmod +x executable
     mkdir -p .stacker/layer-bases
     chmod 777 .stacker/layer-bases
-    image_copy oci:$CENTOS_OCI oci:.stacker/layer-bases/oci:centos
-    umoci unpack --image .stacker/layer-bases/oci:centos dest
-    tar caf .stacker/layer-bases/centos.tar -C dest/rootfs .
+    image_copy oci:$BUSYBOX_OCI oci:.stacker/layer-bases/oci:busybox
+    umoci unpack --image .stacker/layer-bases/oci:busybox dest
+    tar caf .stacker/layer-bases/busybox.tar -C dest/rootfs .
     rm -rf dest
 
     stacker build --substitute "FAVICON=favicon.ico"
     [ "$status" -eq 0 ]
 
     # did we really download the image to the right place?
-    [ -f .stacker/layer-bases/centos.tar ]
+    [ -f .stacker/layer-bases/busybox.tar ]
 
     # did run actually copy the favicon to the right place?
-    stacker grab centos:/favicon.ico
-    [ "$(sha .stacker/imports/centos/favicon.ico)" == "$(sha favicon.ico)" ]
+    stacker grab busybox:/favicon.ico
+    [ "$(sha .stacker/imports/busybox/favicon.ico)" == "$(sha favicon.ico)" ]
 
     [ ! -f roots/layer1/rootfs/favicon.ico ] || [ ! -f roots/layer1/overlay/favicon.ico ]
 
     rm executable
-    stacker grab centos:/usr/bin/executable
+    stacker grab busybox:/usr/bin/executable
     [ "$(stat --format="%a" executable)" = "755" ]
 
     # did we do a copy correctly?
-    [ "$(sha .stacker/imports/centos/stacker.yaml)" == "$(sha ./stacker.yaml)" ]
+    [ "$(sha .stacker/imports/busybox/stacker.yaml)" == "$(sha ./stacker.yaml)" ]
 
     # check OCI image generation
     manifest=$(cat oci/index.json | jq -r .manifests[0].digest | cut -f2 -d:)
@@ -140,15 +140,15 @@ EOF
 
 @test "stacker.yaml without imports can run" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /foo
 EOF
     stacker build
-    umoci unpack --image oci:centos dest
+    umoci unpack --image oci:busybox dest
     [ -f dest/rootfs/foo ]
 }
 
@@ -162,25 +162,25 @@ EOF
 @test "use colons in roots-dir path name should fail" {
     local tmpd=$(pwd)
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /foo
 EOF
     bad_stacker --roots-dir $tmpd/with:colon build
     [ "$status" -eq 1 ]
     echo $output | grep "forbidden"
-} 
+}
 
 @test "use colons in layer name should fail" {
     local tmpd=$(pwd)
     cat > stacker.yaml <<EOF
-centos:with:colon:
+busybox:with:colon:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /foo
 EOF
@@ -194,10 +194,10 @@ EOF
     FAVICON: favicon.ico
 EOF
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: tar
-        url: .stacker/layer-bases/centos.tar
+        url: .stacker/layer-bases/busybox.tar
     import:
         - ./stacker.yaml
         - https://www.cisco.com/favicon.ico
@@ -219,7 +219,7 @@ centos:
 layer1:
     from:
         type: built
-        tag: centos
+        tag: busybox
     run:
         - rm /favicon.ico
 EOF
@@ -228,29 +228,29 @@ EOF
     chmod +x executable
     mkdir -p .stacker/layer-bases
     chmod 777 .stacker/layer-bases
-    image_copy oci:$CENTOS_OCI oci:.stacker/layer-bases/oci:centos
-    umoci unpack --image .stacker/layer-bases/oci:centos dest
-    tar caf .stacker/layer-bases/centos.tar -C dest/rootfs .
+    image_copy oci:$BUSYBOX_OCI oci:.stacker/layer-bases/oci:busybox
+    umoci unpack --image .stacker/layer-bases/oci:busybox dest
+    tar caf .stacker/layer-bases/busybox.tar -C dest/rootfs .
     rm -rf dest
 
     stacker build --substitute-file subs.yaml
     [ "$status" -eq 0 ]
 
     # did we really download the image to the right place?
-    [ -f .stacker/layer-bases/centos.tar ]
+    [ -f .stacker/layer-bases/busybox.tar ]
 
     # did run actually copy the favicon to the right place?
-    stacker grab centos:/favicon.ico
-    [ "$(sha .stacker/imports/centos/favicon.ico)" == "$(sha favicon.ico)" ]
+    stacker grab busybox:/favicon.ico
+    [ "$(sha .stacker/imports/busybox/favicon.ico)" == "$(sha favicon.ico)" ]
 
     [ ! -f roots/layer1/rootfs/favicon.ico ] || [ ! -f roots/layer1/overlay/favicon.ico ]
 
     rm executable
-    stacker grab centos:/usr/bin/executable
+    stacker grab busybox:/usr/bin/executable
     [ "$(stat --format="%a" executable)" = "755" ]
 
     # did we do a copy correctly?
-    [ "$(sha .stacker/imports/centos/stacker.yaml)" == "$(sha ./stacker.yaml)" ]
+    [ "$(sha .stacker/imports/busybox/stacker.yaml)" == "$(sha ./stacker.yaml)" ]
 
     # check OCI image generation
     manifest=$(cat oci/index.json | jq -r .manifests[0].digest | cut -f2 -d:)
diff --git a/test/binds.bats b/test/binds.bats
index 2ecad8566..302ce423e 100644
--- a/test/binds.bats
+++ b/test/binds.bats
@@ -13,7 +13,7 @@ function teardown() {
 bind-test:
     from:
         type: oci
-        url: ${{CENTOS_OCI}}
+        url: ${{BUSYBOX_OCI}}
     binds:
         - ${{bind_path}} -> /root/tree1/foo
     run: |
@@ -29,7 +29,7 @@ EOF
 
     bind_path=$(realpath tree1/foo)
 
-    out=$(stacker build --substitute bind_path=${bind_path} --substitute CENTOS_OCI=$CENTOS_OCI)
+    out=$(stacker build --substitute bind_path=${bind_path} --substitute BUSYBOX_OCI=$BUSYBOX_OCI)
 
     [[ "${out}" =~ ^(.*filesystem bind-test built successfully)$ ]]
 
@@ -41,7 +41,7 @@ EOF
 bind-test:
     from:
         type: oci
-        url: ${{CENTOS_OCI}}
+        url: ${{BUSYBOX_OCI}}
     binds:
         - source: ${{bind_path1}}
           dest: /root/tree1/foo
@@ -65,7 +65,7 @@ EOF
     out=$(stacker build \
         "--substitute=bind_path1=${bind_path1}" \
         "--substitute=bind_path2=${bind_path2}" \
-        "--substitute=CENTOS_OCI=$CENTOS_OCI" ) || {
+        "--substitute=BUSYBOX_OCI=$BUSYBOX_OCI" ) || {
              printf "%s\n" "$out" 1>&2
              exit 1
         }
diff --git a/test/broken-link.bats b/test/broken-link.bats
index ce776e9fe..a43391b7c 100644
--- a/test/broken-link.bats
+++ b/test/broken-link.bats
@@ -14,7 +14,7 @@ function teardown() {
 broken_link:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - dir
     run: cp -a /stacker/imports/dir/testln /testln
diff --git a/test/build-only.bats b/test/build-only.bats
index b3d0f1c7f..3d251d048 100644
--- a/test/build-only.bats
+++ b/test/build-only.bats
@@ -14,7 +14,7 @@ function teardown() {
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
 
     cat > stacker.yaml <<EOF
@@ -36,7 +36,7 @@ EOF
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
 
     cat > stacker.yaml <<EOF
@@ -59,7 +59,7 @@ EOF
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         false
     build_only: true
@@ -79,10 +79,10 @@ EOF
 
 @test "build only stacker" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import: https://www.cisco.com/favicon.ico
     run: |
         cp /stacker/imports/favicon.ico /favicon.ico
@@ -90,9 +90,9 @@ centos:
 layer1:
     from:
         type: built
-        tag: centos
+        tag: busybox
     import:
-        - stacker://centos/favicon.ico
+        - stacker://busybox/favicon.ico
     run:
         - cp /stacker/imports/favicon.ico /favicon2.ico
 EOF
@@ -104,10 +104,10 @@ EOF
 
 @test "stacker grab" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import: https://www.cisco.com/favicon.ico
     run: |
         cp /stacker/imports/favicon.ico /favicon.ico
@@ -115,16 +115,16 @@ centos:
 layer1:
     from:
         type: built
-        tag: centos
+        tag: busybox
     import:
-        - stacker://centos/favicon.ico
+        - stacker://busybox/favicon.ico
     run:
         - cp /stacker/imports/favicon.ico /favicon2.ico
 EOF
     stacker build
-    stacker grab centos:/favicon.ico
+    stacker grab busybox:/favicon.ico
     [ -f favicon.ico ]
-    [ "$(sha favicon.ico)" == "$(sha .stacker/imports/centos/favicon.ico)" ]
+    [ "$(sha favicon.ico)" == "$(sha .stacker/imports/busybox/favicon.ico)" ]
 }
 
 @test "build only + unpriv + overlay clears state" {
@@ -132,7 +132,7 @@ EOF
 first:
     from:
         type: oci
-        url: ${{CENTOS_OCI}}
+        url: ${{BUSYBOX_OCI}}
     build_only: true
     run: |
         echo "run number ${{RUN_NUMBER}}"
@@ -144,8 +144,8 @@ first:
         chmod 500 $THEPATH
 EOF
 
-    stacker build --layer-type=squashfs --substitute "RUN_NUMBER=1" --substitute CENTOS_OCI=$CENTOS_OCI
-    stacker build --layer-type=squashfs --substitute "RUN_NUMBER=2" --substitute CENTOS_OCI=$CENTOS_OCI
+    stacker build --layer-type=squashfs --substitute "RUN_NUMBER=1" --substitute BUSYBOX_OCI=$BUSYBOX_OCI
+    stacker build --layer-type=squashfs --substitute "RUN_NUMBER=2" --substitute BUSYBOX_OCI=$BUSYBOX_OCI
 }
 
 @test "multiple build onlys in final chain rebuild OK" {
@@ -153,7 +153,7 @@ EOF
 one:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /1
 two:
@@ -181,12 +181,12 @@ four:
         [ -f /3 ]
         echo run number ${{RUN_NUMBER}}
 EOF
-    stacker build --substitute "RUN_NUMBER=1" --substitute CENTOS_OCI=$CENTOS_OCI
-    stacker build --substitute "RUN_NUMBER=2" --substitute CENTOS_OCI=$CENTOS_OCI
+    stacker build --substitute "RUN_NUMBER=1" --substitute BUSYBOX_OCI=$BUSYBOX_OCI
+    stacker build --substitute "RUN_NUMBER=2" --substitute BUSYBOX_OCI=$BUSYBOX_OCI
 
     stacker inspect
 
-    # should always build five layers, assuming centos is 1 layer
+    # should always build five layers, assuming busybox is 1 layer
     one_manifest=$(cat oci/index.json | jq -r .manifests[0].digest | cut -f2 -d:)
     one_layercount=$(cat oci/blobs/sha256/$one_manifest | jq -r '.layers | length')
     echo one_layercount "$one_layercount"
diff --git a/test/built-type.bats b/test/built-type.bats
index 15a8d803d..23753ea41 100644
--- a/test/built-type.bats
+++ b/test/built-type.bats
@@ -13,7 +13,7 @@ function teardown() {
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /root/parent
         cat /proc/self/mountinfo
diff --git a/test/caching.bats b/test/caching.bats
index 8681ed791..8c5bd09f0 100644
--- a/test/caching.bats
+++ b/test/caching.bats
@@ -34,7 +34,7 @@ test:
         type: oci
         url: oci:base
 EOF
-    image_copy oci:$CENTOS_OCI oci:oci:base
+    image_copy oci:$BUSYBOX_OCI oci:oci:base
     stacker build
     image_copy oci:$UBUNTU_OCI oci:oci:base
     stacker build
@@ -47,7 +47,7 @@ EOF
 build-base:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 base:
     from:
         type: built
@@ -70,7 +70,7 @@ EOF
 import-cache:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - link/foo
     run: cp /stacker/imports/foo/zomg /zomg
@@ -94,7 +94,7 @@ EOF
 a:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - foo
     run: |
@@ -110,7 +110,7 @@ EOF
 a:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - foo
     run: |
@@ -125,7 +125,7 @@ EOF
 bind-test:
     from:
         type: oci
-        url: ${{CENTOS_OCI}}
+        url: ${{BUSYBOX_OCI}}
     import:
         - tree1/foo/zomg
     binds:
@@ -147,8 +147,8 @@ EOF
     bind_path=$(realpath tree2/foo)
 
     # The layer should be built
-    stacker build --substitute bind_path=${bind_path} --substitute CENTOS_OCI=$CENTOS_OCI
-    out=$(stacker build --substitute bind_path=${bind_path} --substitute CENTOS_OCI=$CENTOS_OCI)
+    stacker build --substitute bind_path=${bind_path} --substitute BUSYBOX_OCI=$BUSYBOX_OCI
+    out=$(stacker build --substitute bind_path=${bind_path} --substitute BUSYBOX_OCI=$BUSYBOX_OCI)
     [[ "${out}" =~ ^(.*rebuilding cached layer due to use of binds in stacker file.*)$ ]]
     [[ "${out}" =~ ^(.*filesystem bind-test built successfully)$ ]]
 
@@ -158,7 +158,7 @@ EOF
     # just hack it.
     echo baz >> tree2/foo/zomg
     # The layer should be rebuilt since the there is a bind configuration in stacker.yaml
-    stacker build --substitute bind_path=${bind_path} --substitute CENTOS_OCI=$CENTOS_OCI
+    stacker build --substitute bind_path=${bind_path} --substitute BUSYBOX_OCI=$BUSYBOX_OCI
     [[ "${output}" =~ ^(.*filesystem bind-test built successfully)$ ]]
     [[ ! "${output}" =~ ^(.*found cached layer bind-test)$ ]]
 }
@@ -168,7 +168,7 @@ EOF
 mode-test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - executable
     run: cp /stacker/imports/executable /executable
@@ -203,7 +203,7 @@ EOF
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - foo
     run: cp /stacker/imports/foo /foo
@@ -218,7 +218,7 @@ EOF
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
     stacker build
     echo '{"version": 1, "cache": "lolnope"}' > .stacker/build.cache
diff --git a/test/chroot.bats b/test/chroot.bats
index 831fd539e..c7d199213 100644
--- a/test/chroot.bats
+++ b/test/chroot.bats
@@ -14,7 +14,7 @@ function teardown() {
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: touch /test
 EOF
     stacker build
diff --git a/test/clean.bats b/test/clean.bats
index f0102df43..0eea2b29a 100644
--- a/test/clean.bats
+++ b/test/clean.bats
@@ -13,7 +13,7 @@ function teardown() {
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
     stacker build
     stacker clean
diff --git a/test/config.bats b/test/config.bats
index 60790868e..5c4fd9c38 100644
--- a/test/config.bats
+++ b/test/config.bats
@@ -18,7 +18,7 @@ function teardown() {
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
 
     stacker "--oci-dir=$tmpd/args-oci" "--stacker-dir=$tmpd/args-stacker" \
@@ -37,7 +37,7 @@ EOF
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
     cat > "$tmpd/config.yaml" <<EOF
 stacker_dir: $tmpd/config-stacker
@@ -74,7 +74,7 @@ my-build:
     build_only: true
     from:
         type: oci
-        url: ${{CENTOS_OCI}}
+        url: ${{BUSYBOX_OCI}}
     run: |
         #!/bin/sh
         set -e
@@ -103,7 +103,7 @@ oci_dir: $odir
 rootfs_dir: $rdir
 EOF
 
-    stacker "--config=$config_yaml" build "--stacker-file=$stacker_yaml" --substitute CENTOS_OCI=$CENTOS_OCI
+    stacker "--config=$config_yaml" build "--stacker-file=$stacker_yaml" --substitute BUSYBOX_OCI=$BUSYBOX_OCI
 
     cmp_files "$expected" "$rdir/my-base/overlay/content.txt"
 }
diff --git a/test/dependency-order.bats b/test/dependency-order.bats
index 7240d62ef..202f24ccc 100644
--- a/test/dependency-order.bats
+++ b/test/dependency-order.bats
@@ -26,7 +26,7 @@ EOF
 test:
     from:
         type: oci
-        tag: $CENTOS_OCI
+        tag: $BUSYBOX_OCI
     import:
         - stacker://foo/bar
         - stacker://baz/foo
diff --git a/test/dirlinks.bats b/test/dirlinks.bats
index b8c96ae08..eed64d200 100644
--- a/test/dirlinks.bats
+++ b/test/dirlinks.bats
@@ -13,7 +13,7 @@ function teardown() {
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         mkdir /dir
         ln -s /dir /link
diff --git a/test/docker-base.bats b/test/docker-base.bats
index 92ff36132..b9191ce08 100644
--- a/test/docker-base.bats
+++ b/test/docker-base.bats
@@ -10,10 +10,10 @@ function teardown() {
 
 @test "importing from a docker hub" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: docker
-        url: oci:${CENTOS_OCI}
+        url: oci:${BUSYBOX_OCI}
     import:
         - https://www.cisco.com/favicon.ico
     run: |
@@ -21,13 +21,13 @@ centos:
 layer1:
     from:
         type: built
-        tag: centos
+        tag: busybox
     run:
         - rm /favicon.ico
 EOF
     stacker build
-    stacker grab centos:/favicon.ico
-    [ "$(sha .stacker/imports/centos/favicon.ico)" == "$(sha favicon.ico)" ]
+    stacker grab busybox:/favicon.ico
+    [ "$(sha .stacker/imports/busybox/favicon.ico)" == "$(sha favicon.ico)" ]
     umoci unpack --image oci:layer1 dest
     [ ! -f dest/rootfs/favicon.ico ]
 }
diff --git a/test/entrypoint.bats b/test/entrypoint.bats
index 00d16e3b8..affb3f361 100644
--- a/test/entrypoint.bats
+++ b/test/entrypoint.bats
@@ -13,7 +13,7 @@ function teardown() {
 base:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     cmd: foo
 layer1:
     from:
diff --git a/test/env.bats b/test/env.bats
index a5719647d..fe9cf439f 100644
--- a/test/env.bats
+++ b/test/env.bats
@@ -17,10 +17,10 @@ function teardown() {
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         # make sure that /stacker is readonly
-        grep "/stacker" /proc/mounts | grep -P "\sro[\s,]"
+        grep "/stacker" /proc/mounts | grep "[[:space:]]ro[[:space:],]"
 
         # make sure stacker deleted the non-import
         [ ! -f /stacker/foo ]
@@ -33,7 +33,7 @@ EOF
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         echo hello world
 EOF
diff --git a/test/helpers.bash b/test/helpers.bash
index dab0b1eb3..8a8ee8857 100644
--- a/test/helpers.bash
+++ b/test/helpers.bash
@@ -40,13 +40,16 @@ function image_copy {
 }
 
 STACKER_DOCKER_BASE=${STACKER_DOCKER_BASE:-docker://}
+STACKER_BUILD_BUSYBOX_IMAGE=${STACKER_BUILD_BUSYBOX_IMAGE:-${STACKER_DOCKER_BASE}busybox:latest}
 STACKER_BUILD_CENTOS_IMAGE=${STACKER_BUILD_CENTOS_IMAGE:-${STACKER_DOCKER_BASE}centos:latest}
 STACKER_BUILD_UBUNTU_IMAGE=${STACKER_BUILD_UBUNTU_IMAGE:-${STACKER_DOCKER_BASE}ubuntu:latest}
 (
     flock 9
+    [ -f "$ROOT_DIR/test/busybox/index.json" ] || (image_copy "${STACKER_BUILD_BUSYBOX_IMAGE}" "oci:$ROOT_DIR/test/busybox:latest" && chmod -R 777 "$ROOT_DIR/test/busybox")
     [ -f "$ROOT_DIR/test/centos/index.json" ] || (image_copy "${STACKER_BUILD_CENTOS_IMAGE}" "oci:$ROOT_DIR/test/centos:latest" && chmod -R 777 "$ROOT_DIR/test/centos")
     [ -f "$ROOT_DIR/test/ubuntu/index.json" ] || (image_copy "${STACKER_BUILD_UBUNTU_IMAGE}" "oci:$ROOT_DIR/test/ubuntu:latest" && chmod -R 777 "$ROOT_DIR/test/ubuntu")
 ) 9<$ROOT_DIR/test/main.py
+export BUSYBOX_OCI="$ROOT_DIR/test/busybox:latest"
 export CENTOS_OCI="$ROOT_DIR/test/centos:latest"
 export UBUNTU_OCI="$ROOT_DIR/test/ubuntu:latest"
 export PATH="$PATH:$ROOT_DIR/hack/tools/bin"
diff --git a/test/import-http.bats b/test/import-http.bats
index 1541821ee..f2bbeb7d1 100644
--- a/test/import-http.bats
+++ b/test/import-http.bats
@@ -11,10 +11,10 @@ function setup() {
     # As we want to be able to have network for base image download
     # in img/stacker1.yaml but disconnect the network for test file download
     cat > img/stacker1.yaml <<EOF
-centos_base:
+busybox_base:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         ls
 EOF
@@ -22,7 +22,7 @@ EOF
 img:
     from:
         type: oci
-        url: $(pwd)/oci:centos_base
+        url: $(pwd)/oci:busybox_base
     import:
         - http://network-test.debian.org/nm
     run: |
@@ -75,10 +75,10 @@ function teardown() {
 
 @test "importing to a dest" {
     cat > img/stacker1.yaml <<EOF
-centos_base:
+busybox_base:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: https://www.cisco.com/favicon.ico
           dest: /dest/icon
diff --git a/test/import.bats b/test/import.bats
index f8b77c6a0..629e1784e 100644
--- a/test/import.bats
+++ b/test/import.bats
@@ -14,7 +14,7 @@ function teardown() {
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - https://bing.com/favicon.ico
 EOF
@@ -31,10 +31,10 @@ EOF
     mkdir -p recursive
     touch recursive/child
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - recursive
     run: |
@@ -52,7 +52,7 @@ EOF
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - recursive
     run: |
@@ -62,7 +62,7 @@ first:
 second:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - stacker://first/recursive
     run: |
@@ -81,7 +81,7 @@ EOF
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: test_file
           hash: $test_file_sha
@@ -109,10 +109,10 @@ EOF
 @test "import with unmatched hash should fail" {
     touch test_file
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: test_file
           hash: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b856
@@ -124,10 +124,10 @@ EOF
 
 @test "invalid hash should fail" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: test_file
           hash: 1234abcdef
@@ -144,7 +144,7 @@ EOF
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: test_file
           hash: $test_file_sha
@@ -172,7 +172,7 @@ EOF
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: https://www.google.com/favicon.ico
           hash: $google_sha
@@ -189,7 +189,7 @@ EOF
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: https://www.google.com/favicon.ico
           hash: 0d4856785d1d3c3aad3e5311e654c70c19d335f927c24ebb89dfcd52b2d988cb
@@ -208,7 +208,7 @@ EOF
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: https://www.google.com/favicon.ico
           hash: $google_sha
@@ -231,7 +231,7 @@ EOF
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: https://www.google.com/favicon.ico
         - path: test_file
@@ -249,7 +249,7 @@ EOF
 thing:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: https://www.google.com/favicon.ico
           hash: $google_sha
@@ -261,10 +261,10 @@ EOF
 
 @test "invalid import " {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - "zomg"
         - - "one"
@@ -275,10 +275,10 @@ EOF
 
 @test "import a full directory tree with siblings" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - dir
     run: |
@@ -306,7 +306,7 @@ EOF
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - path: test_file
           hash: $test_file_sha
@@ -402,7 +402,7 @@ EOF
 first:
   from:
     type: oci
-    url: $CENTOS_OCI
+    url: $BUSYBOX_OCI
   import:
   - path: folder1/
     dest: /folder1/
@@ -421,7 +421,7 @@ second:
 third:
   from:
     type: oci
-    url: $CENTOS_OCI
+    url: $BUSYBOX_OCI
   import:
     - path: stacker://second/folder1/
       dest: /folder1/
@@ -432,7 +432,7 @@ third:
 fourth:
   from:
     type: oci
-    url: $CENTOS_OCI
+    url: $BUSYBOX_OCI
   import:
   - path: folder1/
     dest: /
@@ -445,7 +445,7 @@ fourth:
 fifth:
   from:
     type: oci
-    url: $CENTOS_OCI
+    url: $BUSYBOX_OCI
   import:
   - path: folder1/subfolder2/
     dest: /folder3/
diff --git a/test/invalid.bats b/test/invalid.bats
index 7db3d0009..2f181b901 100644
--- a/test/invalid.bats
+++ b/test/invalid.bats
@@ -13,7 +13,7 @@ function teardown() {
 bad:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - stacker://idontexist/file
 EOF
@@ -34,7 +34,7 @@ EOF
 layer1:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
     cat > stacker2.yaml <<EOF
 config:
@@ -43,7 +43,7 @@ config:
 layer2:
     from:
         type: built
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
     bad_stacker build -f stacker2.yaml
 }
diff --git a/test/labels.bats b/test/labels.bats
index cafdc21dc..c34ada403 100644
--- a/test/labels.bats
+++ b/test/labels.bats
@@ -13,7 +13,7 @@ function teardown() {
 label:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     generate_labels: |
         echo -n "rocks" > /stacker/oci-labels/meshuggah
 EOF
diff --git a/test/log.bats b/test/log.bats
index 4a38cccc6..853bef623 100644
--- a/test/log.bats
+++ b/test/log.bats
@@ -34,7 +34,7 @@ function teardown() {
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
 
     stacker --progress build
@@ -46,7 +46,7 @@ EOF
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
 
     stacker build
diff --git a/test/multi-arch.bats b/test/multi-arch.bats
index 3755b0d5f..2360f3dcb 100644
--- a/test/multi-arch.bats
+++ b/test/multi-arch.bats
@@ -10,12 +10,12 @@ function teardown() {
 
 @test "multi-arch/os support" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     os: darwin
     arch: arm64
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - https://www.cisco.com/favicon.ico
 EOF
@@ -31,11 +31,11 @@ EOF
 
 @test "multi-arch/os bad config fails" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     os:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - https://www.cisco.com/favicon.ico
 EOF
diff --git a/test/multiple-output-types.bats b/test/multiple-output-types.bats
index 1896312c6..b3f83045d 100644
--- a/test/multiple-output-types.bats
+++ b/test/multiple-output-types.bats
@@ -13,7 +13,7 @@ function teardown() {
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         echo meshuggah > /rocks
 EOF
@@ -36,7 +36,7 @@ EOF
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         echo meshuggah > /rocks
 child:
@@ -72,7 +72,7 @@ EOF
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         echo meshuggah > /rocks
     build_only: true
@@ -109,7 +109,7 @@ EOF
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         echo meshuggah > /rocks
 EOF
@@ -124,7 +124,7 @@ EOF
 one:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 two:
     build_only: true
     from:
@@ -176,7 +176,7 @@ EOF
 one:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 two:
     build_only: true
     from:
diff --git a/test/oci-import.bats b/test/oci-import.bats
index f7b8ef75b..d54d03932 100644
--- a/test/oci-import.bats
+++ b/test/oci-import.bats
@@ -13,18 +13,18 @@ function teardown() {
 output1:
     from:
         type: oci
-        url: oci:centos
+        url: oci:busybox
 output2:
     from:
         type: oci
-        url: oci:centos
+        url: oci:busybox
 EOF
 
-    image_copy oci:$CENTOS_OCI oci:oci:centos
+    image_copy oci:$BUSYBOX_OCI oci:oci:busybox
     stacker build
 
     name0=$(cat oci/index.json | jq -r .manifests[0].annotations.'"org.opencontainers.image.ref.name"')
-    [ "$name0" == "centos" ]
+    [ "$name0" == "busybox" ]
     name1=$(cat oci/index.json | jq -r .manifests[1].annotations.'"org.opencontainers.image.ref.name"')
     [ "$name1" == "output1" ]
     name2=$(cat oci/index.json | jq -r .manifests[2].annotations.'"org.opencontainers.image.ref.name"')
@@ -33,28 +33,28 @@ EOF
 
 @test "oci imports" {
     cat > stacker.yaml <<EOF
-centos2:
+busybox2:
     from:
         type: oci
-        url: dest:centos
+        url: dest:busybox
 EOF
-    image_copy oci:$CENTOS_OCI oci:dest:centos
+    image_copy oci:$BUSYBOX_OCI oci:dest:busybox
     stacker build
-    [ "$(umoci ls --layout ./oci)" == "$(printf "centos2")" ]
+    [ "$(umoci ls --layout ./oci)" == "$(printf "busybox2")" ]
 }
 
 @test "oci imports colons in version" {
     cat > stacker.yaml <<EOF
-centos3:
+busybox3:
     from:
         type: oci
-        url: dest:centos:0.1.1
+        url: dest:busybox:0.1.1
     run:
         touch /zomg
 EOF
-    image_copy oci:$CENTOS_OCI oci:dest:centos:0.1.1
+    image_copy oci:$BUSYBOX_OCI oci:dest:busybox:0.1.1
     stacker build
-    [ "$(umoci ls --layout ./oci)" == "$(printf "centos3")" ]
-    umoci unpack --image oci:centos3 dest
+    [ "$(umoci ls --layout ./oci)" == "$(printf "busybox3")" ]
+    umoci unpack --image oci:busybox3 dest
     [ -f dest/rootfs/zomg ]
 }
diff --git a/test/overlay-dirs.bats b/test/overlay-dirs.bats
index 174f05a9a..896a18378 100644
--- a/test/overlay-dirs.bats
+++ b/test/overlay-dirs.bats
@@ -19,7 +19,7 @@ function teardown() {
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     overlay_dirs:
         - source: dir_to_overlay
     run: |
@@ -42,7 +42,7 @@ EOF
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     overlay_dirs:
         - source: dir_to_overlay
     run: |
@@ -68,7 +68,7 @@ EOF
 build:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     binds:
         - dir_to_overlay -> /dir_to_overlay
     run: |
@@ -98,7 +98,7 @@ EOF
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     overlay_dirs:
         - source: dir_to_overlay
           dest: /usr/local
@@ -122,7 +122,7 @@ EOF
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     overlay_dirs:
         - source: dir_to_overlay1
           dest: /usr/local1
@@ -178,14 +178,15 @@ EOF
 first:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     overlay_dirs:
         - source: dir_to_overlay
           dest: /usr/local
     run: |
         [ -f /usr/local/file ]
-        [ "\$(stat --format=%G /usr/local/file )" == "root" ]
-        [ "\$(stat --format=%U /usr/local/file )" == "root" ]
+        # -c == --format, but busybox does not support --format
+        [ "\$(stat -c%G /usr/local/file )" == "root" ]
+        [ "\$(stat -c%U /usr/local/file )" == "root" ]
 EOF
     stacker build
 
diff --git a/test/prerequisites.bats b/test/prerequisites.bats
index 44a91f561..04052788a 100644
--- a/test/prerequisites.bats
+++ b/test/prerequisites.bats
@@ -8,7 +8,7 @@ function setup() {
 layer1_1:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - import1
     run: |
@@ -16,7 +16,7 @@ layer1_1:
 layer1_2:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run:
         touch /root/import0
 EOF
@@ -161,7 +161,7 @@ EOF
 one:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /one
 EOF
@@ -212,7 +212,7 @@ EOF
 one:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /one
 EOF
@@ -246,7 +246,7 @@ EOF
 one:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
 
     stacker recursive-build
@@ -260,11 +260,11 @@ EOF
 same:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 same:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
     bad_stacker build | grep "duplicate layer name"
 }
@@ -274,7 +274,7 @@ EOF
 same:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
     cat > b.yaml <<EOF
 config:
diff --git a/test/publish.bats b/test/publish.bats
index 865f69c45..86636acb3 100644
--- a/test/publish.bats
+++ b/test/publish.bats
@@ -8,7 +8,7 @@ function setup() {
 layer1:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - import1
     run: |
@@ -35,7 +35,7 @@ EOF
 layer3:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     build_only: true
 EOF
     mkdir -p ocibuilds/sub4
@@ -43,7 +43,7 @@ EOF
 layer4:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         ls > /root/ls_out
 EOF
diff --git a/test/squashfs.bats b/test/squashfs.bats
index 7da20da54..feed5da98 100644
--- a/test/squashfs.bats
+++ b/test/squashfs.bats
@@ -18,7 +18,7 @@ function teardown() {
 build:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     build_only: true
 importer:
     from:
@@ -32,20 +32,20 @@ EOF
 
 @test "squashfs mutate /usr/bin" {
     cat > stacker.yaml <<EOF
-centos1:
+busybox1:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /usr/bin/foo
 EOF
     stacker build --layer-type=squashfs
 
     cat > stacker.yaml <<EOF
-centos2:
+busybox2:
     from:
         type: oci
-        url: oci:centos1-squashfs
+        url: oci:busybox1-squashfs
     run: |
         ls /usr/bin | grep foo
 EOF
@@ -54,10 +54,10 @@ EOF
 
 @test "squashfs import support" {
     cat > stacker.yaml <<EOF
-centos1:
+busybox1:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /1
 EOF
@@ -65,10 +65,10 @@ EOF
     mv oci oci-import
 
     cat > stacker.yaml <<EOF
-centos2:
+busybox2:
     from:
         type: oci
-        url: oci-import:centos1-squashfs
+        url: oci-import:busybox1-squashfs
     run: |
         [ -f /1 ]
 EOF
@@ -77,10 +77,10 @@ EOF
 
 @test "squashfs layer support (overlay)" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /1
 EOF
@@ -93,7 +93,7 @@ EOF
 
     mkdir layer0
     mount -t squashfs oci/blobs/sha256/$layer0 layer0
-    [ -f layer0/bin/bash ]
+    [ -f layer0/bin/sh ]
 
     mkdir layer1
     mount -t squashfs oci/blobs/sha256/$layer1 layer1
@@ -102,10 +102,10 @@ EOF
 
 @test "squashfs file whiteouts (overlay)" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         rm -rf /etc/selinux
         rm -f /usr/bin/ls
@@ -137,12 +137,12 @@ EOF
 build:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     build_only: true
 importer:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - stacker://build/bin/ls
     run: |
@@ -154,16 +154,16 @@ EOF
 @test "built type with squashfs works" {
     mkdir -p .stacker/layer-bases
     chmod 777 .stacker/layer-bases
-    image_copy oci:$CENTOS_OCI oci:.stacker/layer-bases/oci:centos
-    umoci unpack --image .stacker/layer-bases/oci:centos dest
-    tar caf .stacker/layer-bases/centos.tar -C dest/rootfs .
+    image_copy oci:$BUSYBOX_OCI oci:.stacker/layer-bases/oci:busybox
+    umoci unpack --image .stacker/layer-bases/oci:busybox dest
+    tar caf .stacker/layer-bases/busybox.tar -C dest/rootfs .
     rm -rf dest
 
 	cat > stacker.yaml <<EOF
 base:
   from:
     type: tar
-    url: .stacker/layer-bases/centos.tar
+    url: .stacker/layer-bases/busybox.tar
   run: |
     echo "hello world" > /message
 
@@ -191,16 +191,16 @@ EOF
 @test "built type with squashfs build-only base works (overlay)" {
     mkdir -p .stacker/layer-bases
     chmod 777 .stacker/layer-bases
-    image_copy oci:$CENTOS_OCI oci:.stacker/layer-bases/oci:centos
-    umoci unpack --image .stacker/layer-bases/oci:centos dest
-    tar caf .stacker/layer-bases/centos.tar -C dest/rootfs .
+    image_copy oci:$BUSYBOX_OCI oci:.stacker/layer-bases/oci:busybox
+    umoci unpack --image .stacker/layer-bases/oci:busybox dest
+    tar caf .stacker/layer-bases/busybox.tar -C dest/rootfs .
     rm -rf dest
 
 	cat > stacker.yaml <<EOF
 base:
   from:
     type: tar
-    url: .stacker/layer-bases/centos.tar
+    url: .stacker/layer-bases/busybox.tar
   run: |
     echo "hello world" > /message
   build_only: true
diff --git a/test/tmpfs.bats b/test/tmpfs.bats
index 4bca70595..2eb46d789 100644
--- a/test/tmpfs.bats
+++ b/test/tmpfs.bats
@@ -13,7 +13,7 @@ function teardown() {
 test:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         echo hello world
 EOF
diff --git a/test/unprivileged.bats b/test/unprivileged.bats
index 40c715921..1db0a475e 100644
--- a/test/unprivileged.bats
+++ b/test/unprivileged.bats
@@ -13,14 +13,14 @@ function teardown() {
 parent:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         touch /etc/000
         chmod 000 /etc/000
 child:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     run: |
         echo "zomg" > /etc/000
         chmod 000 /etc/000
@@ -38,10 +38,10 @@ EOF
 
 @test "unprivileged stacker" {
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - https://www.cisco.com/favicon.ico
     run: |
@@ -49,13 +49,13 @@ centos:
 layer1:
     from:
         type: built
-        tag: centos
+        tag: busybox
     run:
         - rm /favicon.ico
 EOF
     stacker build
-    umoci unpack --image oci:centos centos
-    [ "$(sha .stacker/imports/centos/favicon.ico)" == "$(sha centos/rootfs/favicon.ico)" ]
+    umoci unpack --image oci:busybox busybox
+    [ "$(sha .stacker/imports/busybox/favicon.ico)" == "$(sha busybox/rootfs/favicon.ico)" ]
     umoci unpack --image oci:layer1 layer1
     [ ! -f layer1/rootfs/favicon.ico ]
 }
@@ -70,10 +70,10 @@ chmod -w import
 EOF
 
     cat > stacker.yaml <<EOF
-centos:
+busybox:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - import
 EOF
@@ -95,7 +95,7 @@ EOF
 base:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - first
         - second
@@ -125,7 +125,7 @@ EOF
 base:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
     import:
         - test
     run: cat /stacker/imports/test
@@ -145,7 +145,7 @@ EOF
 image:
     from:
         type: oci
-        url: $CENTOS_OCI
+        url: $BUSYBOX_OCI
 EOF
 
     stacker build --layer-type squashfs
@@ -154,6 +154,6 @@ EOF
 
     mkdir layer0
     mount -t squashfs oci/blobs/sha256/$layer0 layer0
-    echo "mount has uid $(stat --format "%u" layer0/usr/bin/mount)"
-    [ "$(stat --format "%u" layer0/usr/bin/mount)" = "0" ]
+    echo "mount has uid $(stat --format "%u" layer0/bin/mount)"
+    [ "$(stat --format "%u" layer0/bin/mount)" = "0" ]
 }