diff --git a/src/tests/end2end/BufferTests.cpp b/src/tests/end2end/BufferTests.cpp
index 849da12e56..82b26ba745 100644
--- a/src/tests/end2end/BufferTests.cpp
+++ b/src/tests/end2end/BufferTests.cpp
@@ -154,7 +154,7 @@ TEST_P(BufferMappingTests, MapRead_InCallback) {
     wgpu::Buffer buffer = CreateMapReadBuffer(kBufferSize);
 
     uint32_t myData[3] = {0x01020304, 0x05060708, 0x090A0B0C};
-    constexpr size_t kSize = sizeof(myData);
+    static constexpr size_t kSize = sizeof(myData);
     queue.WriteBuffer(buffer, 0, &myData, kSize);
 
     struct UserData {
@@ -355,8 +355,8 @@ TEST_P(BufferMappingTests, OffsetNotUpdatedOnError) {
 TEST_P(BufferMappingTests, MapWrite_InCallbackDefault) {
     wgpu::Buffer buffer = CreateMapWriteBuffer(4);
 
-    constexpr uint32_t myData = 2934875;
-    constexpr size_t kSize = sizeof(myData);
+    static constexpr uint32_t myData = 2934875;
+    static constexpr size_t kSize = sizeof(myData);
 
     struct UserData {
         bool done;
@@ -396,8 +396,8 @@ TEST_P(BufferMappingTests, MapWrite_InCallbackDefault) {
 TEST_P(BufferMappingTests, MapWrite_InCallbackRange) {
     wgpu::Buffer buffer = CreateMapWriteBuffer(4);
 
-    constexpr uint32_t myData = 2934875;
-    constexpr size_t kSize = sizeof(myData);
+    static constexpr uint32_t myData = 2934875;
+    static constexpr size_t kSize = sizeof(myData);
 
     struct UserData {
         bool done;
diff --git a/src/tests/end2end/DepthStencilSamplingTests.cpp b/src/tests/end2end/DepthStencilSamplingTests.cpp
index b4795ecfdb..35c2e7429d 100644
--- a/src/tests/end2end/DepthStencilSamplingTests.cpp
+++ b/src/tests/end2end/DepthStencilSamplingTests.cpp
@@ -43,8 +43,7 @@ namespace {
     const std::vector<float> kNormalizedTextureValues = {0.0, 0.3, 0.4, 0.5, 1.0};
 
     // Test the limits, and some values in between.
-    const std::vector<uint8_t> kStencilValues = {uint8_t(0), uint8_t(1), uint8_t(38), uint8_t(255),
-                                                 uint8_t(256)};
+    const std::vector<uint8_t> kStencilValues = {uint8_t(0), uint8_t(1), uint8_t(38), uint8_t(255)};
 
 }  // anonymous namespace