diff --git a/lib/drmtest.c b/lib/drmtest.c
index 658f52e6..2755ebeb 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -165,26 +165,6 @@ void gem_quiescent_gpu(int fd)
 	gem_sync(fd, handle);
 }
 
-static bool is_master(int fd)
-{
-	drm_client_t client;
-	int ret;
-
-	/* Check that we're the only opener and authed. */
-	client.idx = 0;
-	ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
-	igt_assert (ret == 0);
-	if (!client.auth) {
-		return 0;
-	}
-	client.idx = 1;
-	ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
-	if (ret != -1 || errno != EINVAL) {
-		return 0;
-	}
-	return 1;
-}
-
 /**
  * drm_get_card() - get an intel card number for use in /dev or /sys
  *
@@ -192,7 +172,7 @@ static bool is_master(int fd)
  *
  * returns -1 on error
  */
-int drm_get_card(int master)
+int drm_get_card(void)
 {
 	char *name;
 	int i, fd;
@@ -209,17 +189,7 @@ int drm_get_card(int master)
 		if (fd == -1)
 			continue;
 
-		if (is_intel(fd) && master == 0) {
-			close(fd);
-			break;
-		}
-
-		if (master == 1 && is_master(fd)) {
-			close(fd);
-			break;
-		}
-
-		if (master == -1 && !is_master(fd)) {
+		if (is_intel(fd)) {
 			close(fd);
 			break;
 		}
@@ -236,7 +206,7 @@ static int __drm_open_any(void)
 	char *name;
 	int ret, fd;
 
-	ret = asprintf(&name, "/dev/dri/card%d", drm_get_card(0));
+	ret = asprintf(&name, "/dev/dri/card%d", drm_get_card());
 	if (ret == -1)
 		return -1;
 
@@ -278,28 +248,6 @@ int drm_open_any(void)
 	return fd;
 }
 
-/**
- * Open the first DRM device we can find where we end up being the master.
- */
-int drm_open_any_master(void)
-{
-	char *name;
-	int ret, fd;
-
-	ret = asprintf(&name, "/dev/dri/card%d", drm_get_card(1));
-	if (ret == -1)
-		return -1;
-
-	fd = open(name, O_RDWR);
-	free(name);
-	if (fd == -1)
-		fprintf(stderr, "Couldn't find an un-controlled DRM device\n");
-
-	igt_assert(is_intel(fd));
-
-	return fd;
-}
-
 void gem_set_tiling(int fd, uint32_t handle, int tiling, int stride)
 {
 	struct drm_i915_gem_set_tiling st;
diff --git a/lib/drmtest.h b/lib/drmtest.h
index c4e90683..d2fe2429 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -44,9 +44,8 @@
 drm_intel_bo * gem_handle_to_libdrm_bo(drm_intel_bufmgr *bufmgr, int fd,
 				       const char *name, uint32_t handle);
 
-int drm_get_card(int master);
+int drm_get_card(void);
 int drm_open_any(void);
-int drm_open_any_master(void);
 
 void gem_quiescent_gpu(int fd);
 
diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c
index 0680b2e4..2e97f76f 100644
--- a/tests/gem_flink_race.c
+++ b/tests/gem_flink_race.c
@@ -51,7 +51,7 @@ static int get_object_count(void)
 {
 	FILE *file;
 	int ret, scanned;
-	int device = drm_get_card(0);
+	int device = drm_get_card();
 	char *path;
 
 	ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device);
diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c
index 4be54cbc..7549eb63 100644
--- a/tests/gem_seqno_wrap.c
+++ b/tests/gem_seqno_wrap.c
@@ -648,7 +648,7 @@ int main(int argc, char **argv)
 
 	parse_options(argc, argv);
 
-	card_index = drm_get_card(0);
+	card_index = drm_get_card();
 	igt_assert(card_index != -1);
 
 	srandom(time(NULL));
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 1d4a884e..fe85dcb0 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -570,7 +570,7 @@ static void eat_error_state(struct test_output *o)
 	static const char data[] = "";
 	static char tmp[128];
 	char fname[FILENAME_MAX];
-	int card_index = drm_get_card(0);
+	int card_index = drm_get_card();
 	int fd;
 	ssize_t r;
 
@@ -624,7 +624,7 @@ static void hang_gpu(struct test_output *o)
 	static const char dfs_entry[] = "i915_ring_stop";
 	static const char data[] = "0xf";
 	char fname[FILENAME_MAX];
-	int card_index = drm_get_card(0);
+	int card_index = drm_get_card();
 	int fd;
 	ssize_t r;
 
diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c
index 6b3611d6..32b9aa71 100644
--- a/tests/prime_self_import.c
+++ b/tests/prime_self_import.c
@@ -216,7 +216,7 @@ static int get_object_count(void)
 {
 	FILE *file;
 	int ret, scanned;
-	int device = drm_get_card(0);
+	int device = drm_get_card();
 	char *path;
 
 	ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device);
diff --git a/tests/sysfs_rc6_residency.c b/tests/sysfs_rc6_residency.c
index 7e75acc9..f96d5eca 100644
--- a/tests/sysfs_rc6_residency.c
+++ b/tests/sysfs_rc6_residency.c
@@ -56,7 +56,7 @@ static unsigned int readit(const char *path)
 
 int main(int argc, char *argv[])
 {
-	const int device = drm_get_card(0);
+	const int device = drm_get_card();
 	char *path, *pathp, *pathpp;
 	int fd, ret;
 	unsigned int value1, value1p, value1pp, value2, value2p, value2pp;
diff --git a/tests/sysfs_rps.c b/tests/sysfs_rps.c
index 867f9130..55804c0e 100644
--- a/tests/sysfs_rps.c
+++ b/tests/sysfs_rps.c
@@ -129,7 +129,7 @@ static void dumpit(void)
 
 int main(int argc, char *argv[])
 {
-	const int device = drm_get_card(0);
+	const int device = drm_get_card();
 	struct junk *junk = stuff;
 	int fd, ret;
 
diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c
index 260c3d0c..ad027aca 100644
--- a/tools/intel_l3_parity.c
+++ b/tools/intel_l3_parity.c
@@ -108,7 +108,7 @@ static int do_parse(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-	const int device = drm_get_card(0);
+	const int device = drm_get_card();
 	char *path;
 	unsigned int devid;
 	int drm_fd, fd, ret;