diff --git a/tests/m_corrupt_e2image/expect b/tests/i_bad_csum/expect
similarity index 100%
rename from tests/m_corrupt_e2image/expect
rename to tests/i_bad_csum/expect
diff --git a/tests/m_corrupt_e2image/image.gz b/tests/i_bad_csum/image.gz
similarity index 100%
rename from tests/m_corrupt_e2image/image.gz
rename to tests/i_bad_csum/image.gz
diff --git a/tests/i_bad_csum/name b/tests/i_bad_csum/name
new file mode 100644
index 00000000..f7197f0d
--- /dev/null
+++ b/tests/i_bad_csum/name
@@ -0,0 +1 @@
+run e2image on a file system with bad checksums
diff --git a/tests/m_corrupt_e2image/script b/tests/i_bad_csum/script
similarity index 100%
rename from tests/m_corrupt_e2image/script
rename to tests/i_bad_csum/script
diff --git a/tests/i_e2image/i_e2image.crc b/tests/i_qcow/i_qcow.crc
similarity index 79%
rename from tests/i_e2image/i_e2image.crc
rename to tests/i_qcow/i_qcow.crc
index 02a84644..00e5e6fb 100644
--- a/tests/i_e2image/i_e2image.crc
+++ b/tests/i_qcow/i_qcow.crc
@@ -1,14 +1,14 @@
-i_e2image/image1024.orig
+i_qcow/image1024.orig
 2161078647	image1024.orig
 467277198	_image.raw
 2164212449	_image.qcow2
 467277198	_image.qcow2.raw
-i_e2image/image2048.orig
+i_qcow/image2048.orig
 672740642	image2048.orig
 3688408350	_image.raw
 3821412753	_image.qcow2
 3688408350	_image.qcow2.raw
-i_e2image/image4096.orig
+i_qcow/image4096.orig
 4077552412	image4096.orig
 4159471388	_image.raw
 636354894	_image.qcow2
diff --git a/tests/i_e2image/image1024.orig.bz2 b/tests/i_qcow/image1024.orig.bz2
similarity index 100%
rename from tests/i_e2image/image1024.orig.bz2
rename to tests/i_qcow/image1024.orig.bz2
diff --git a/tests/i_e2image/image2048.orig.bz2 b/tests/i_qcow/image2048.orig.bz2
similarity index 100%
rename from tests/i_e2image/image2048.orig.bz2
rename to tests/i_qcow/image2048.orig.bz2
diff --git a/tests/i_e2image/image4096.orig.bz2 b/tests/i_qcow/image4096.orig.bz2
similarity index 100%
rename from tests/i_e2image/image4096.orig.bz2
rename to tests/i_qcow/image4096.orig.bz2
diff --git a/tests/i_e2image/script b/tests/i_qcow/script
similarity index 100%
rename from tests/i_e2image/script
rename to tests/i_qcow/script
diff --git a/tests/m_corrupt_e2image/name b/tests/m_corrupt_e2image/name
deleted file mode 100644
index 1da39359..00000000
--- a/tests/m_corrupt_e2image/name
+++ /dev/null
@@ -1 +0,0 @@
-e2image corrupt fs