diff --git a/.pick_status.json b/.pick_status.json
index e0ade1df6be..7eb76537ae2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -40,7 +40,7 @@
         "description": "osmesa: Pacify MSVC in the test code",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "c5c1aa7c75c05927017325829cb3f354654d0b73"
     },
diff --git a/src/gallium/targets/osmesa/test-render.cpp b/src/gallium/targets/osmesa/test-render.cpp
index fbb0f3dfca2..3b6531f6c92 100644
--- a/src/gallium/targets/osmesa/test-render.cpp
+++ b/src/gallium/targets/osmesa/test-render.cpp
@@ -169,7 +169,7 @@ TEST(OSMesaRenderTest, depth)
       OSMesaCreateContextExt(OSMESA_RGB_565, 24, 8, 0, NULL), &OSMesaDestroyContext};
    ASSERT_TRUE(ctx);
 
-   int w = 3, h = 2;
+   const int w = 3, h = 2;
    uint8_t pixels[4096 * h * 2] = {0}; /* different cpp from our depth! */
    auto ret = OSMesaMakeCurrent(ctx.get(), &pixels, GL_UNSIGNED_SHORT_5_6_5, w, h);
    ASSERT_EQ(ret, GL_TRUE);