diff --git a/tests/pm_pc8.c b/tests/pm_pc8.c
index e56a5f8c..4ecfdfdf 100644
--- a/tests/pm_pc8.c
+++ b/tests/pm_pc8.c
@@ -629,6 +629,13 @@ static void setup_environment(void)
 		      "Machine doesn't support PC8+ residencies.\n");
 }
 
+static void teardown_environment(void)
+{
+	fini_mode_set_data(&ms_data);
+	drmClose(drm_fd);
+	close(msr_fd);
+}
+
 static void basic_subtest(void)
 {
 	/* Make sure PC8+ residencies move! */
@@ -661,13 +668,6 @@ static void modeset_subtest(enum screen_type type, int rounds,
 	}
 }
 
-static void teardown_environment(void)
-{
-	fini_mode_set_data(&ms_data);
-	drmClose(drm_fd);
-	close(msr_fd);
-}
-
 /* Test of the DRM resources reported by the IOCTLs are still the same. This
  * ensures we still see the monitors with the same eyes. We get the EDIDs and
  * compare them, which ensures we use DP AUX or GMBUS depending on what's