diff --git a/tests/fsck-tests/020-extent-ref-cases/test.sh b/tests/fsck-tests/020-extent-ref-cases/test.sh
index 1e1e4e23..0c4f7848 100755
--- a/tests/fsck-tests/020-extent-ref-cases/test.sh
+++ b/tests/fsck-tests/020-extent-ref-cases/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# In order to confirm that btrfsck supports to check a variety of refs, add the
-# following cases:
+# In order to confirm that 'btrfs check' supports checking a variety of refs,
+# add the following cases:
 #
 # * keyed_block_ref
 # * keyed_data_ref
@@ -19,12 +19,11 @@ source "$TOP/tests/common"
 
 check_prereq btrfs
 
-for img in *.img *.raw.xz
-do
-	image=$(extract_image "$img")
+check_image() {
+	local image
 
-	# Since the return value bug is already fixed, we don't need
-	# the old grep hack to detect bug.
+	image=$1
 	run_check "$TOP/btrfs" check "$image"
-	rm -f "$image"
-done
+}
+
+check_all_images