diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index 751c912..eea78ce 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -77,9 +77,8 @@
     REPORTER_ASSERT(reporter, match);
 
     // Now try writing on the single channel texture
-    SkCanvas canvas;
-
-    canvas.setDevice(new SkGpuDevice(context, texture->asRenderTarget()))->unref();
+    SkAutoTUnref<SkDevice> device(new SkGpuDevice(context, texture->asRenderTarget()));
+    SkCanvas canvas(device);
 
     SkPaint paint;