diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 0fa7afcd..9e0aefe5 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -14,6 +14,7 @@ NOUVEAU_TESTS_M = \
 	$(NULL)
 
 TESTS_progs_M = \
+	core_get_client_auth \
 	drv_suspend \
 	gem_basic \
 	gem_caching \
@@ -63,7 +64,6 @@ TESTS_progs = \
 	core_getclient \
 	core_getstats \
 	core_getversion \
-	core_get_client_auth \
 	drm_vma_limiter \
 	drm_vma_limiter_cached \
 	drm_vma_limiter_cpu \
diff --git a/tests/core_get_client_auth.c b/tests/core_get_client_auth.c
index 2f493f94..566a6580 100644
--- a/tests/core_get_client_auth.c
+++ b/tests/core_get_client_auth.c
@@ -73,16 +73,28 @@ static bool check_auth(int fd)
 	return is_authenticated;
 }
 
-int main(int argc, char **argv)
+
+igt_main
 {
-	int fd;
-	bool auth;
-
-	fd = drm_open_any();
-
 	/* root (which we run igt as) should always be authenticated */
-	auth = check_auth(fd);
-	igt_assert(auth);
+	igt_subtest("simple") {
+		int fd = drm_open_any();
 
-	return 0;
+		igt_assert(check_auth(fd) == true);
+
+		close(fd);
+	}
+
+	igt_subtest("master-drop") {
+		int fd = drm_open_any();
+		int fd2 = drm_open_any();
+
+		igt_assert(check_auth(fd2) == true);
+
+		close(fd);
+
+		igt_assert(check_auth(fd2) == true);
+
+		close(fd2);
+	}
 }