diff --git a/test/gzip.bats b/test/gzip.bats
index 7b7676e8..ca3c1518 100644
--- a/test/gzip.bats
+++ b/test/gzip.bats
@@ -8,123 +8,9 @@ function teardown() {
     cleanup
 }
 
-@test "import tar < 1M" {
-  mkdir -p folder1
-  truncate -s 512k  folder1/file1
-  tar cvf test.tar folder1
-  cat > stacker.yaml <<EOF
-tar:
-  from:
-    type: tar
-    url: test.tar
-EOF
-  stacker build
-  cat oci/index.json | jq .
-  m1=$(cat oci/index.json | jq .manifests[0].digest | sed  's/sha256://' | tr -d \")
-  cat oci/blobs/sha256/"$m1" | jq .
-  l1=$(cat oci/blobs/sha256/"$m1" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
-  $SKOPEO --version
-  [[ "$($SKOPEO --version)" =~ "skopeo version ${SKOPEO_VERSION}" ]] || {
-    echo "$SKOPEO --version should be ${SKOPEO_VERSION}"
-    exit 1
-  }
-  $SKOPEO copy --format=oci oci:oci:tar containers-storage:test:tar
-  $SKOPEO copy --format=oci containers-storage:test:tar oci:oci:test
-  cat oci/index.json | jq .
-  m2=$(cat oci/index.json | jq .manifests[1].digest | sed  's/sha256://' | tr -d \")
-  cat oci/blobs/sha256/"$m2" | jq .
-  l2=$(cat oci/blobs/sha256/"$m2" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
-  echo "$l1"
-  echo "$l2"
-  [ "$l1" = "$l2" ]
-}
-
-@test "import tar > 1M" {
-  mkdir -p folder1
-  truncate -s 2m folder1/file1
-  tar cvf test.tar folder1
-  cat > stacker.yaml <<EOF
-tar:
-  from:
-    type: tar
-    url: test.tar
-EOF
-  stacker build
-  cat oci/index.json | jq .
-  m1=$(cat oci/index.json | jq .manifests[0].digest | sed  's/sha256://' | tr -d \")
-  cat oci/blobs/sha256/"$m1" | jq .
-  l1=$(cat oci/blobs/sha256/"$m1" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
-  [[ "$($SKOPEO --version)" =~ "skopeo version ${SKOPEO_VERSION}" ]] || {
-    echo "$SKOPEO --version should be ${SKOPEO_VERSION}"
-    exit 1
-  }
-  $SKOPEO copy --format=oci oci:oci:tar containers-storage:test:tar
-  $SKOPEO copy --format=oci containers-storage:test:tar oci:oci:test
-  cat oci/index.json | jq .
-  m2=$(cat oci/index.json | jq .manifests[1].digest | sed  's/sha256://' | tr -d \")
-  cat oci/blobs/sha256/"$m2" | jq .
-  l2=$(cat oci/blobs/sha256/"$m2" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
-  echo "$l1"
-  echo "$l2"
-  [ "$l1" = "$l2" ]
-}
-
-@test "import tar.gz < 1M" {
-  mkdir -p folder1
-  truncate -s 512k folder1/file1
-  tar cvzf test.tar.gz folder1
-  cat > stacker.yaml <<EOF
-tar:
-  from:
-    type: tar
-    url: test.tar.gz
-EOF
-  stacker build
-  cat oci/index.json | jq .
-  m1=$(cat oci/index.json | jq .manifests[0].digest | sed  's/sha256://' | tr -d \")
-  cat oci/blobs/sha256/"$m1" | jq .
-  l1=$(cat oci/blobs/sha256/"$m1" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
-  [[ "$($SKOPEO --version)" =~ "skopeo version ${SKOPEO_VERSION}" ]] || {
-    echo "$SKOPEO --version should be ${SKOPEO_VERSION}"
-    exit 1
-  }
-  $SKOPEO copy --format=oci oci:oci:tar containers-storage:test:tar
-  $SKOPEO copy --format=oci containers-storage:test:tar oci:oci:test
-  cat oci/index.json | jq .
-  m2=$(cat oci/index.json | jq .manifests[1].digest | sed  's/sha256://' | tr -d \")
-  cat oci/blobs/sha256/"$m2" | jq .
-  l2=$(cat oci/blobs/sha256/"$m2" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
-  echo "$l1"
-  echo "$l2"
-  [ "$l1" = "$l2" ]
-}
-
-@test "import tar.gz > 1M" {
-  mkdir -p folder1
-  truncate -s 2m folder1/file1
-  tar cvzf test.tar.gz folder1
-  cat > stacker.yaml <<EOF
-tar:
-  from:
-    type: tar
-    url: test.tar.gz
-EOF
-  stacker build
-  cat oci/index.json | jq .
-  m1=$(cat oci/index.json | jq .manifests[0].digest | sed  's/sha256://' | tr -d \")
-  cat oci/blobs/sha256/"$m1" | jq .
-  l1=$(cat oci/blobs/sha256/"$m1" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
-  [[ "$($SKOPEO --version)" =~ "skopeo version ${SKOPEO_VERSION}" ]] || {
-    echo "$SKOPEO --version should be ${SKOPEO_VERSION}"
-    exit 1
-  }
-  $SKOPEO copy --format=oci oci:oci:tar containers-storage:test:tar
-  $SKOPEO copy --format=oci containers-storage:test:tar oci:oci:test
-  cat oci/index.json | jq .
-  m2=$(cat oci/index.json | jq .manifests[1].digest | sed  's/sha256://' | tr -d \")
-  cat oci/blobs/sha256/"$m2" | jq .
-  l2=$(cat oci/blobs/sha256/"$m2" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
-  echo "$l1"
-  echo "$l2"
-  [ "$l1" = "$l2" ]
+@test "import various sizes" {
+  test_copy_buffer_size 512k tar
+  test_copy_buffer_size 2m tar
+  test_copy_buffer_size 512k tar.gz
+  test_copy_buffer_size 2m tar.gz
 }
diff --git a/test/helpers.bash b/test/helpers.bash
index e2ad36ac..f6866bf9 100644
--- a/test/helpers.bash
+++ b/test/helpers.bash
@@ -200,3 +200,47 @@ function zot_teardown {
   killall zot
   rm -f $TEST_TMPDIR/zot-config.json
 }
+
+function test_copy_buffer_size() {
+   local buffer_size=$1
+   local file_type=$2
+   mkdir folder1
+   truncate -s $buffer_size folder1/file1
+   if [ $file_type = "tar" ]
+   then
+     tar cvf test.$file_type folder1
+   elif [ $file_type = "tar.gz" ]
+   then
+     tar cvzf test.$file_type folder1
+   else
+    echo "unknown file type: $file_type"
+    exit 1
+   fi
+   cat > stacker.yaml <<EOF
+tar:
+  from:
+    type: tar
+    url: test.$file_type
+EOF
+  stacker build
+  cat oci/index.json | jq .
+  m1=$(cat oci/index.json | jq .manifests[0].digest | sed  's/sha256://' | tr -d \")
+  cat oci/blobs/sha256/"$m1" | jq .
+  l1=$(cat oci/blobs/sha256/"$m1" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
+  $SKOPEO --version
+  [[ "$($SKOPEO --version)" =~ "skopeo version ${SKOPEO_VERSION}" ]] || {
+    echo "$SKOPEO --version should be ${SKOPEO_VERSION}"
+    exit 1
+  }
+  $SKOPEO copy --format=oci oci:oci:tar containers-storage:test:tar
+  $SKOPEO copy --format=oci containers-storage:test:tar oci:oci:test
+  cat oci/index.json | jq .
+  m2=$(cat oci/index.json | jq .manifests[1].digest | sed  's/sha256://' | tr -d \")
+  cat oci/blobs/sha256/"$m2" | jq .
+  l2=$(cat oci/blobs/sha256/"$m2" | jq .layers[0].digest | sed  's/sha256://' | tr -d \")
+  echo "$l1"
+  echo "$l2"
+  [ "$l1" = "$l2" ]
+  stacker clean
+  rm -rf folder1
+}