diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
index e7ebcc2d..e17e1902 100644
--- a/tests/gem_storedw_loop.c
+++ b/tests/gem_storedw_loop.c
@@ -180,6 +180,8 @@ igt_main
 		}
 	}
 
-	drm_intel_bufmgr_destroy(bufmgr);
-	close(fd);
+	igt_fixture {
+		drm_intel_bufmgr_destroy(bufmgr);
+		close(fd);
+	}
 }