diff --git a/test/whiteout.bats b/test/whiteout.bats
new file mode 100644
index 00000000..a8756c20
--- /dev/null
+++ b/test/whiteout.bats
@@ -0,0 +1,72 @@
+load helpers
+
+function setup() {
+    stacker_setup
+}
+
+function teardown() {
+    cleanup
+}
+
+@test "test not adding extraneous whiteouts" {
+    cat > stacker.yaml <<EOF
+image:
+  from:
+    type: docker
+    url: docker://ubuntu:latest
+  run: |
+    apt-get -y install libsensors-config
+EOF
+
+  stacker build
+  echo "checking"
+  for f in $(ls oci/blobs/sha256/); do
+    file oci/blobs/sha256/$f | grep "gzip" || {
+      echo "skipping $f"
+        continue
+    }
+    tar -tvzf oci/blobs/sha256/$f | grep ".wh.sensors.d" && {
+      echo "should not have a sensors.d whiteout!"
+        exit 1
+    }
+  done
+}
+
+@test "dont emit whiteout for new dir creates" {
+  cat > stacker.yaml <<EOF
+  # a1.tar has /a1/file
+bb:
+  from:
+    type: docker
+    url: docker://busybox
+  run: |
+    mkdir /a1
+    touch /a1/file
+
+nodir:
+  from:
+    type: built
+    tag: bb
+  run: |
+    rm -rf /a1
+
+emptydir:
+  from:
+    type: built
+    tag: bb
+  run: |
+    rm -rf /a1
+    mkdir /a1
+
+fulldir:
+  from:
+    type: built
+    tag: bb
+  run: |
+    rm -rf /a1
+    mkdir /a1
+    touch /a1/newfile
+EOF
+
+  stacker build
+}