diff --git a/Makefile b/Makefile
index 0f6910690ed477b63198631f05b36bcf70cfa55a..1417ad4d5e3f071e4df68a2e26704a81a4f4bf6a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ all: pdf
 
 test: pdf
 	LD_LIBRARY_PATH=$(HAMMER_LIB) sh -c \
-	'for x in test/*.pdf; do ./pdf "$$x" >/dev/null && echo OK: "$$x"; done'
+	'for x in test/valid/*.pdf; do ./pdf "$$x" >/dev/null && echo OK: "$$x"; done'
 	@true
 
 pdf: $(SOURCES)
diff --git a/test/should_fail/ascii85-longzero.pdf b/test/invalid/ascii85-longzero.pdf
similarity index 100%
rename from test/should_fail/ascii85-longzero.pdf
rename to test/invalid/ascii85-longzero.pdf
diff --git a/test/should_fail/ascii85-partial2-inval.pdf b/test/invalid/ascii85-partial2-inval.pdf
similarity index 100%
rename from test/should_fail/ascii85-partial2-inval.pdf
rename to test/invalid/ascii85-partial2-inval.pdf
diff --git a/test/should_fail/ascii85-partial2-overflow.pdf b/test/invalid/ascii85-partial2-overflow.pdf
similarity index 100%
rename from test/should_fail/ascii85-partial2-overflow.pdf
rename to test/invalid/ascii85-partial2-overflow.pdf
diff --git a/test/should_fail/loop.pdf b/test/invalid/loop.pdf
similarity index 100%
rename from test/should_fail/loop.pdf
rename to test/invalid/loop.pdf
diff --git a/test/should_fail/missing_xref_crash_regr.pdf b/test/invalid/missing_xref_crash_regr.pdf
similarity index 100%
rename from test/should_fail/missing_xref_crash_regr.pdf
rename to test/invalid/missing_xref_crash_regr.pdf
diff --git a/test/should_fail/text-broken-Tf.pdf b/test/invalid/text-broken-Tf.pdf
similarity index 100%
rename from test/should_fail/text-broken-Tf.pdf
rename to test/invalid/text-broken-Tf.pdf
diff --git a/test/ascii85-partial2-zero.pdf b/test/valid/ascii85-partial2-zero.pdf
similarity index 100%
rename from test/ascii85-partial2-zero.pdf
rename to test/valid/ascii85-partial2-zero.pdf
diff --git a/test/ascii85-partial2.pdf b/test/valid/ascii85-partial2.pdf
similarity index 100%
rename from test/ascii85-partial2.pdf
rename to test/valid/ascii85-partial2.pdf
diff --git a/test/ascii85-partial3.pdf b/test/valid/ascii85-partial3.pdf
similarity index 100%
rename from test/ascii85-partial3.pdf
rename to test/valid/ascii85-partial3.pdf
diff --git a/test/ascii85-partial4.pdf b/test/valid/ascii85-partial4.pdf
similarity index 100%
rename from test/ascii85-partial4.pdf
rename to test/valid/ascii85-partial4.pdf
diff --git a/test/ascii85-zero.pdf b/test/valid/ascii85-zero.pdf
similarity index 100%
rename from test/ascii85-zero.pdf
rename to test/valid/ascii85-zero.pdf
diff --git a/test/ascii85.pdf b/test/valid/ascii85.pdf
similarity index 100%
rename from test/ascii85.pdf
rename to test/valid/ascii85.pdf
diff --git a/test/hello.pdf b/test/valid/hello.pdf
similarity index 100%
rename from test/hello.pdf
rename to test/valid/hello.pdf
diff --git a/test/lzw.pdf b/test/valid/lzw.pdf
similarity index 100%
rename from test/lzw.pdf
rename to test/valid/lzw.pdf