diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
index cfc06a15b..4bd78d239 100644
--- a/libweston/renderer-gl/gl-renderer.c
+++ b/libweston/renderer-gl/gl-renderer.c
@@ -4798,16 +4798,15 @@ gl_renderer_output_create(struct weston_output *output,
 			  const struct weston_geometry *area)
 {
 	struct gl_output_state *go;
-	struct gl_renderer *gr = get_renderer(output->compositor);
-	const struct weston_testsuite_quirks *quirks;
+	struct weston_compositor *wc = output->compositor;
+	struct gl_renderer *gr = get_renderer(wc);
+	const struct weston_testsuite_quirks *quirks = &wc->test_data.test_quirks;
 	bool needs_fb_curves;
 	bool needs_shadow;
 	int i;
 
 	assert(!get_output_state(output));
 
-	quirks = &output->compositor->test_data.test_quirks;
-
 	go = zalloc(sizeof *go);
 	if (go == NULL)
 		return -1;
@@ -4835,7 +4834,7 @@ gl_renderer_output_create(struct weston_output *output,
 			  !output->from_blend_to_output_by_backend;
 
 	if (needs_fb_curves)
-		weston_assert_true(gr->compositor, gl_features_has(gr, FEATURE_COLOR_TRANSFORMS));
+		weston_assert_true(wc, gl_features_has(gr, FEATURE_COLOR_TRANSFORMS));
 
 	if (!needs_shadow && needs_fb_curves) {
 		switch (quirks->blending_impl) {
@@ -4851,7 +4850,7 @@ gl_renderer_output_create(struct weston_output *output,
 				weston_log("Error: quirks were used to force in-shader blending, "
 					   "but it's not supported by the GLES implementation.\n"
 					   "Quitting...\n");
-				weston_compositor_exit_with_code(gr->compositor, RESULT_SKIP);
+				weston_compositor_exit_with_code(wc, RESULT_SKIP);
 			}
 			break;
 		}