diff --git a/tests/Makefile.am b/tests/Makefile.am
index b7acfd8..a18f9e6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,6 +34,8 @@
 TESTS_XFAIL_TESTS = 
 
 TESTS_TESTS = \
+	tests/cli-colorspace.tap \
+	tests/cli-pipe.tap \
 	tests/validate-compare.tap \
 	tests/validate-composite.tap \
 	tests/validate-convert.tap \
@@ -43,8 +45,6 @@
 	tests/validate-stream.tap \
 	tests/validate-formats-in-memory.tap \
 	tests/validate-formats-on-disk.tap \
-	tests/cli-colorspace.tap \
-	tests/cli-pipe.tap \
 	tests/drawtest.tap \
 	tests/wandtest.tap
 
diff --git a/tests/validate-colorspace.tap b/tests/cli-colorspace.tap
similarity index 100%
rename from tests/validate-colorspace.tap
rename to tests/cli-colorspace.tap
diff --git a/tests/validate-pipe.tap b/tests/cli-pipe.tap
similarity index 100%
rename from tests/validate-pipe.tap
rename to tests/cli-pipe.tap