diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 814dc9b971..4ee28035ed 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -486,6 +486,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkImage_makeTextureImage, reporter, contextIn
                 ERRORF(reporter, "makeTextureImage changed image alpha type.");
             }
         }
+
+        testContext->makeCurrent();
+        context->flush();
     }
 }
 
@@ -1123,6 +1126,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredTextureImage, reporter, ctxInfo) {
             }
             sk_free(buffer);
         }
+
+        testContext->makeCurrent();
+        context->flush();
     }
 }
 #endif
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 547d3b2ce3..a9b4643540 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -251,6 +251,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) {
                     if (renderable) {
                         desc.fFlags = kRenderTarget_GrSurfaceFlag;
                         tex = provider->createTexture(desc, budgeted);
+                        if (!tex) {
+                            continue; // This can fail on Mesa
+                        }
                         sk_sp<GrRenderTarget> rt(sk_ref_sp(tex->asRenderTarget()));
 
                         sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(rt, origin));