diff --git a/tests/.gitignore b/tests/.gitignore
index e99b2da0..09ea074f 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,6 +1,8 @@
 # Please keep sorted alphabetically
+core_getclient
+core_getstats
+core_getversion
 ddi_compute_wrpll
-debugfs_pipe_crc
 drv_suspend
 drm_get_client_auth
 drm_vma_limiter
@@ -93,9 +95,6 @@ gen3_render_linear_blits
 gen3_render_mixed_blits
 gen3_render_tiledx_blits
 gen3_render_tiledy_blits
-getclient
-getstats
-getversion
 igt_fork_helper
 igt_list_only
 igt_no_exit
@@ -104,6 +103,7 @@ igt_no_subtest
 kms_addfb
 kms_cursor_crc
 kms_flip
+kms_pipe_crc_basic
 kms_render
 kms_setmode
 pm_pc8
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4e2813ff..807a67c0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,7 +17,6 @@ NOUVEAU_TESTS_M = \
 endif
 
 TESTS_progs_M = \
-	debugfs_pipe_crc \
 	drv_suspend \
 	gem_basic \
 	gem_caching \
@@ -54,6 +53,7 @@ TESTS_progs_M = \
 	kms_addfb \
 	kms_cursor_crc \
 	kms_flip \
+	kms_pipe_crc_basic \
 	kms_render \
 	kms_setmode \
 	$(NOUVEAU_TESTS_M) \
@@ -135,7 +135,7 @@ TESTS_scripts = \
 	drv_hangman \
 	drv_missed_irq_hang \
 	drv_module_reload \
-	sysfs_edid_timing \
+	kms_sysfs_edid_timing \
 	sysfs_l3_parity \
 	test_rte_check \
 	tools_test \
diff --git a/tests/debugfs_pipe_crc.c b/tests/kms_pipe_crc_basic.c
similarity index 100%
rename from tests/debugfs_pipe_crc.c
rename to tests/kms_pipe_crc_basic.c
diff --git a/tests/sysfs_edid_timing b/tests/kms_sysfs_edid_timing
similarity index 100%
rename from tests/sysfs_edid_timing
rename to tests/kms_sysfs_edid_timing