diff --git a/lib/drmtest.c b/lib/drmtest.c
index 8164ef93..576b4ab1 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -812,8 +812,6 @@ int igt_subtest_init_parse_opts(int argc, char **argv,
 		case 'l':
 			if (!run_single_subtest)
 				list_subtests = true;
-			else
-				igt_install_exit_handler(check_igt_exit);
 			break;
 		case 'r':
 			if (!list_subtests)
@@ -842,6 +840,8 @@ int igt_subtest_init_parse_opts(int argc, char **argv,
 		}
 	}
 
+	igt_install_exit_handler(check_igt_exit);
+
 out:
 	return ret;
 }