diff --git a/tests/kms_sink_crc_basic.c b/tests/kms_sink_crc_basic.c
index f02a950b..5fb27d96 100644
--- a/tests/kms_sink_crc_basic.c
+++ b/tests/kms_sink_crc_basic.c
@@ -48,15 +48,9 @@ typedef struct {
 	igt_plane_t *primary;
 } data_t;
 
-static void get_crc(data_t *data, char *crc) {
+static void get_crc(char *crc) {
 	int ret;
-	FILE *file;
-
-	igt_wait_for_vblank(data->drm_fd, 0);
-	igt_wait_for_vblank(data->drm_fd, 0);
-
-	file = igt_debugfs_fopen("i915_sink_crc_eDP1", "r");
-
+	FILE *file = fopen("/sys/kernel/debug/dri/0/i915_sink_crc_eDP1", "r");
 	igt_require(file);
 
 	ret = fscanf(file, "%s\n", crc);
@@ -117,7 +111,7 @@ static void basic_sink_crc_check(data_t *data)
 	igt_display_commit(&data->display);
 
 	/* It should be Green */
-	get_crc(data, crc);
+	get_crc(crc);
 	assert_color(crc, GREEN);
 
 	/* Go Red */
@@ -125,7 +119,7 @@ static void basic_sink_crc_check(data_t *data)
 	igt_display_commit(&data->display);
 
 	/* It should be Red */
-	get_crc(data, crc);
+	get_crc(crc);
 	assert_color(crc, RED);
 }
 
@@ -142,7 +136,7 @@ static void run_test(data_t *data)
 		    c->connection != DRM_MODE_CONNECTED)
 			continue;
 
-		igt_output_set_pipe(output, 0);
+		igt_output_set_pipe(output, PIPE_ANY);
 
 		mode = igt_output_get_mode(output);