diff --git a/tests/Makefile.am b/tests/Makefile.am
index 807a67c0..a9bd8b2a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -63,6 +63,9 @@ TESTS_progs_M = \
 	$(NULL)
 
 TESTS_progs = \
+	core_getclient \
+	core_getstats \
+	core_getversion \
 	drm_get_client_auth \
 	drm_vma_limiter \
 	drm_vma_limiter_cached \
@@ -116,9 +119,6 @@ TESTS_progs = \
 	gen3_render_mixed_blits \
 	gen3_render_tiledx_blits \
 	gen3_render_tiledy_blits \
-	getclient \
-	getstats \
-	getversion \
 	prime_udl \
 	pm_rc6_residency \
 	pm_rps \
diff --git a/tests/NAMING-CONVENTION b/tests/NAMING-CONVENTION
index f57033c0..f08e2828 100644
--- a/tests/NAMING-CONVENTION
+++ b/tests/NAMING-CONVENTION
@@ -7,6 +7,8 @@ naming scheme for tests and subtests.
 Test Prefixes
 -------------
 
+core_: Test for core drm ioctls and behaviour.
+
 kms_: Used for modesetting tests.
 
 drm_: Tests for libdrm behaviour, currently just testing the buffer cache
diff --git a/tests/getclient.c b/tests/core_getclient.c
similarity index 100%
rename from tests/getclient.c
rename to tests/core_getclient.c
diff --git a/tests/getstats.c b/tests/core_getstats.c
similarity index 100%
rename from tests/getstats.c
rename to tests/core_getstats.c
diff --git a/tests/getversion.c b/tests/core_getversion.c
similarity index 100%
rename from tests/getversion.c
rename to tests/core_getversion.c