diff --git a/tests/.gitignore b/tests/.gitignore
index c6a99bed..bb90685b 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -104,7 +104,7 @@ gem_tiling_max_stride
 gem_unfence_active_buffers
 gem_unref_active_buffers
 gem_userptr_blits
-gem_wait_render_timeout
+gem_wait
 gem_write_read_ring_switch
 gem_workarounds
 gen3_mixed_blits
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index d18d7b58..5202ab26 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -136,7 +136,7 @@ TESTS_progs = \
 	gem_tiling_max_stride \
 	gem_unfence_active_buffers \
 	gem_unref_active_buffers \
-	gem_wait_render_timeout \
+	gem_wait \
 	gem_workarounds \
 	gen3_mixed_blits \
 	gen3_render_linear_blits \
diff --git a/tests/gem_wait_render_timeout.c b/tests/gem_wait.c
similarity index 96%
rename from tests/gem_wait_render_timeout.c
rename to tests/gem_wait.c
index 86640faf..0a8ccf62 100644
--- a/tests/gem_wait_render_timeout.c
+++ b/tests/gem_wait.c
@@ -106,12 +106,12 @@ static void blt_color_fill(struct intel_batchbuffer *batch,
 	ADVANCE_BATCH();
 }
 
-igt_simple_main
+static void render_timeout(int fd)
 {
 	drm_intel_bufmgr *bufmgr;
 	struct intel_batchbuffer *batch;
 	uint64_t timeout = ENOUGH_WORK_IN_SECONDS * NSEC_PER_SEC;
-	int fd, ret;
+	int ret;
 	const bool do_signals = true; /* signals will seem to make the operation
 				       * use less process CPU time */
 	bool done = false;
@@ -119,8 +119,6 @@ igt_simple_main
 
 	igt_skip_on_simulation();
 
-	fd = drm_open_any();
-
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 	drm_intel_bufmgr_gem_enable_reuse(bufmgr);
 	batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd));
@@ -217,3 +215,18 @@ igt_simple_main
 
 	close(fd);
 }
+
+int drm_fd;
+
+igt_main
+{
+	igt_fixture
+		drm_fd = drm_open_any();
+
+	igt_subtest("render_timeout")
+		render_timeout(drm_fd);
+
+
+	igt_fixture
+		close(drm_fd);
+}