diff --git a/tests/fsck-tests/054-orphan-directory/default.img.xz b/tests/fsck-tests/054-orphan-directory/default.img.xz
new file mode 100644
index 00000000..4fac926c
Binary files /dev/null and b/tests/fsck-tests/054-orphan-directory/default.img.xz differ
diff --git a/tests/fsck-tests/054-orphan-directory/test.sh b/tests/fsck-tests/054-orphan-directory/test.sh
new file mode 100755
index 00000000..f3d380d9
--- /dev/null
+++ b/tests/fsck-tests/054-orphan-directory/test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# We could potentially have a directory and it's children with ORPHAN items left
+# for them without having been cleaned up.
+#
+# fsck shouldn't complain about this or attempt to do anything about it, the
+# orphan cleanup will do the correct thing.
+#
+# To create this image I simply modified the kernel to skip doing the
+# btrfs_truncate_inode_items() and removing the orphan item at evict time, and
+# then rm -rf'ed a directory.
+
+source "$TEST_TOP/common"
+
+check_prereq btrfs
+
+check_image() {
+	run_check "$TOP/btrfs" check "$1"
+}
+
+check_all_images