diff --git a/test/device-offset.c b/test/device-offset.c
index dfeb50815..a7a6731e2 100644
--- a/test/device-offset.c
+++ b/test/device-offset.c
@@ -65,20 +65,20 @@ draw (cairo_t *cr, int width, int height)
 					    SIZE / 2, SIZE / 2);
     cairo_surface_set_device_offset (surface, - SIZE / 2, - SIZE / 2);
     cr2 = cairo_create (surface);
+    cairo_surface_destroy (surface);
 
     cairo_set_source_rgb (cr2, 1, 0, 0); /* red */
     draw_square (cr2);
 
-    cairo_destroy (cr2);
 
     /* Finally, copy the offset surface to the original destination.
     * The final result should be a blue square with the lower-right
     * quarter red. */
-    cairo_set_source_surface (cr, surface, 0, 0);
+    cairo_set_source_surface (cr, cairo_get_target (cr2), 0, 0);
+    cairo_destroy (cr2);
 
     cairo_paint (cr);
 
-    cairo_surface_destroy (surface);
 
     return CAIRO_TEST_SUCCESS;
 }