diff --git a/tests/gem_exec_alignment.c b/tests/gem_exec_alignment.c
index a18e23f7..1f9d4894 100644
--- a/tests/gem_exec_alignment.c
+++ b/tests/gem_exec_alignment.c
@@ -193,14 +193,16 @@ static void single(int fd)
 	gem_close(fd, execobj.handle);
 }
 
-igt_simple_main
+igt_main
 {
 	int fd;
 
-	igt_skip_on_simulation();
-	fd = drm_open_driver(DRIVER_INTEL);
+	igt_fixture
+		fd = drm_open_driver(DRIVER_INTEL);
 
-	single(fd);
-	many(fd);
+	igt_subtest("single") /* basic! */
+		single(fd);
+	igt_subtest("many")
+		many(fd);
 
 }