diff --git a/dm/DMGpuTestProcs.cpp b/dm/DMGpuTestProcs.cpp
index 70c4799..736c472 100644
--- a/dm/DMGpuTestProcs.cpp
+++ b/dm/DMGpuTestProcs.cpp
@@ -64,6 +64,9 @@
         ReporterContext ctx(reporter, SkString(GrContextFactory::ContextTypeName(contextType)));
         if (ctxInfo.grContext()) {
             (*test)(reporter, ctxInfo);
+            // In case the test changed the current context make sure we move it back before
+            // calling flush.
+            ctxInfo.testContext()->makeCurrent();
             ctxInfo.grContext()->flush();
         }
     }