diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3d18f736..04edf7e5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -69,7 +69,8 @@ TESTS = \
 	$(NULL)
 
 test:
-	whoami | grep root || ( echo not running as root; exit 1 )
+	whoami | grep root || ( echo ERROR: not running as root; exit 1 )
+	./check_drm_clients
 	make TESTS="${kernel_tests}" check
 
 HANG = \
@@ -79,7 +80,7 @@ HANG = \
 	$(NULL)
 
 EXTRA_PROGRAMS = $(TESTS_progs) $(HANG)
-EXTRA_DIST = $(TESTS_scripts)
+EXTRA_DIST = $(TESTS_scripts) check_drm_clients
 CLEANFILES = $(EXTRA_PROGRAMS)
 
 AM_CFLAGS = $(DRM_CFLAGS) $(WARN_CFLAGS) \