diff --git a/tests/gem_exec_basic.c b/tests/gem_exec_basic.c
index 2b84e403..b0a4cda2 100644
--- a/tests/gem_exec_basic.c
+++ b/tests/gem_exec_basic.c
@@ -107,6 +107,8 @@ igt_main
 	igt_fixture
 		fd = drm_open_driver(DRIVER_INTEL);
 
+	igt_fork_hang_detector(fd);
+
 	for (e = intel_execution_engines; e->name; e++) {
 		igt_subtest_f("basic-%s", e->name)
 			noop(fd, e->exec_id | e->flags);
@@ -116,6 +118,8 @@ igt_main
 			gtt(fd, e->exec_id | e->flags);
 	}
 
+	igt_stop_hang_detector();
+
 	igt_fixture
 		close(fd);
 }
diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
index c7bb3269..4134b24a 100644
--- a/tests/gem_exec_nop.c
+++ b/tests/gem_exec_nop.c
@@ -166,6 +166,8 @@ igt_main
 		gem_write(device, handle, 0, &bbe, sizeof(bbe));
 	}
 
+	igt_fork_hang_detector(device);
+
 	igt_subtest("basic")
 		all(device, handle, 10);
 
@@ -176,6 +178,8 @@ igt_main
 	igt_subtest("all")
 		all(device, handle, 150);
 
+	igt_stop_hang_detector();
+
 	igt_fixture {
 		gem_close(device, handle);
 		close(device);
diff --git a/tests/gem_exec_store.c b/tests/gem_exec_store.c
index b7eb34fd..937d760f 100644
--- a/tests/gem_exec_store.c
+++ b/tests/gem_exec_store.c
@@ -96,10 +96,14 @@ igt_main
 	igt_fixture
 		fd = drm_open_driver_master(DRIVER_INTEL);
 
+	igt_fork_hang_detector(fd);
+
 	for (e = intel_execution_engines; e->name; e++)
 		igt_subtest_f("basic-%s", e->name)
 			store_dword(fd, e->exec_id | e->flags);
 
+	igt_stop_hang_detector();
+
 	igt_fixture
 		close(fd);
 }
diff --git a/tests/gem_exec_suspend.c b/tests/gem_exec_suspend.c
index 6babed8c..687bbeef 100644
--- a/tests/gem_exec_suspend.c
+++ b/tests/gem_exec_suspend.c
@@ -241,6 +241,8 @@ igt_main
 	igt_fixture
 		fd = drm_open_driver_master(DRIVER_INTEL);
 
+	igt_fork_hang_detector(fd);
+
 	igt_subtest("basic-S3")
 		run_test(fd, -1, SUSPEND);
 	igt_subtest("basic-S4")
@@ -257,6 +259,8 @@ igt_main
 		}
 	}
 
+	igt_stop_hang_detector();
+
 	igt_fixture
 		close(fd);
 }
diff --git a/tests/gem_sync.c b/tests/gem_sync.c
index af3c47ed..9e604abc 100644
--- a/tests/gem_sync.c
+++ b/tests/gem_sync.c
@@ -170,6 +170,8 @@ igt_main
 	igt_fixture
 		fd = drm_open_driver(DRIVER_INTEL);
 
+	igt_fork_hang_detector(fd);
+
 	for (e = intel_execution_engines; e->name; e++) {
 		igt_subtest_f("basic-%s", e->name)
 			sync_ring(fd, e->exec_id | e->flags, 1);
@@ -182,6 +184,8 @@ igt_main
 	igt_subtest("forked-all")
 		sync_ring(fd, ~0u, ncpus);
 
+	igt_stop_hang_detector();
+
 	igt_fixture
 		close(fd);
 }