diff --git a/src/dawn_native/CopyTextureForBrowserHelper.cpp b/src/dawn_native/CopyTextureForBrowserHelper.cpp
index facac3a5d9..67ff65c27f 100644
--- a/src/dawn_native/CopyTextureForBrowserHelper.cpp
+++ b/src/dawn_native/CopyTextureForBrowserHelper.cpp
@@ -57,7 +57,7 @@ namespace dawn_native {
 
             [[location(0)]] var<out> texCoord: vec2<f32>;
             [[builtin(position)]] var<out> Position : vec4<f32>;
-            [[builtin(vertex_idx)]] var<in> VertexIndex : i32;
+            [[builtin(vertex_idx)]] var<in> VertexIndex : u32;
             [[binding(0), set(0)]] var<uniform> uniforms : Uniforms;
             [[stage(vertex)]]
             fn main() -> void {
diff --git a/src/tests/end2end/ClipSpaceTests.cpp b/src/tests/end2end/ClipSpaceTests.cpp
index 278560da2a..055fdeee46 100644
--- a/src/tests/end2end/ClipSpaceTests.cpp
+++ b/src/tests/end2end/ClipSpaceTests.cpp
@@ -34,7 +34,7 @@ class ClipSpaceTest : public DawnTest {
                 vec3<f32>(-1.0, -1.0, 0.5),
                 vec3<f32>( 1.0, -1.0, 0.0));
 
-            [[builtin(vertex_idx)]] var<in> VertexIndex : i32;
+            [[builtin(vertex_idx)]] var<in> VertexIndex : u32;
             [[builtin(position)]] var<out> Position : vec4<f32>;
 
             [[stage(vertex)]] fn main() -> void {
diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp
index a932739a7b..edee56baab 100644
--- a/src/tests/end2end/ColorStateTests.cpp
+++ b/src/tests/end2end/ColorStateTests.cpp
@@ -30,7 +30,7 @@ class ColorStateTest : public DawnTest {
         DawnTest::SetUp();
 
         vsModule = utils::CreateShaderModuleFromWGSL(device, R"(
-                [[builtin(vertex_idx)]] var<in> VertexIndex : i32;
+                [[builtin(vertex_idx)]] var<in> VertexIndex : u32;
                 [[builtin(position)]] var<out> Position : vec4<f32>;
 
                 [[stage(vertex)]] fn main() -> void {
diff --git a/src/tests/end2end/CompressedTextureFormatTests.cpp b/src/tests/end2end/CompressedTextureFormatTests.cpp
index 8a2fe23f83..b58ed31903 100644
--- a/src/tests/end2end/CompressedTextureFormatTests.cpp
+++ b/src/tests/end2end/CompressedTextureFormatTests.cpp
@@ -143,7 +143,7 @@ class CompressedTextureBCFormatTest : public DawnTest {
             [[builtin(position)]] var<out> Position : vec4<f32>;
             [[location(0)]] var<out> texCoord : vec2 <f32>;
 
-            [[builtin(vertex_idx)]] var<in> VertexIndex : i32;
+            [[builtin(vertex_idx)]] var<in> VertexIndex : u32;
 
             [[stage(vertex)]] fn main() -> void {
                 const pos : array<vec2<f32>, 3> = array<vec2<f32>, 3>(
diff --git a/src/tests/end2end/CullingTests.cpp b/src/tests/end2end/CullingTests.cpp
index 7445c4f93c..2f54a101d8 100644
--- a/src/tests/end2end/CullingTests.cpp
+++ b/src/tests/end2end/CullingTests.cpp
@@ -34,7 +34,7 @@ class CullingTest : public DawnTest {
                 vec2<f32>( 1.0,  0.0),
                 vec2<f32>( 1.0, -1.0));
 
-            [[builtin(vertex_idx)]] var<in> VertexIndex : i32;
+            [[builtin(vertex_idx)]] var<in> VertexIndex : u32;
             [[builtin(position)]] var<out> Position : vec4<f32>;
 
             [[stage(vertex)]] fn main() -> void {
diff --git a/src/tests/end2end/DepthBiasTests.cpp b/src/tests/end2end/DepthBiasTests.cpp
index 00d0509294..b01bdeb1b3 100644
--- a/src/tests/end2end/DepthBiasTests.cpp
+++ b/src/tests/end2end/DepthBiasTests.cpp
@@ -36,7 +36,7 @@ class DepthBiasTests : public DawnTest {
             case QuadAngle::Flat:
                 // Draw a square at z = 0.25
                 vertexSource = R"(
-    [[builtin(vertex_idx)]] var<in> VertexIndex : i32;
+    [[builtin(vertex_idx)]] var<in> VertexIndex : u32;
     [[builtin(position)]] var<out> Position : vec4<f32>;
     [[stage(vertex)]] fn main() -> void {
         const pos : array<vec2<f32>, 6> = array<vec2<f32>, 6>(
@@ -54,7 +54,7 @@ class DepthBiasTests : public DawnTest {
             case QuadAngle::TiltedX:
                 // Draw a square ranging from 0 to 0.5, bottom to top
                 vertexSource = R"(
-    [[builtin(vertex_idx)]] var<in> VertexIndex : i32;
+    [[builtin(vertex_idx)]] var<in> VertexIndex : u32;
     [[builtin(position)]] var<out> Position : vec4<f32>;
     [[stage(vertex)]] fn main() -> void {
         const pos : array<vec3<f32>, 6> = array<vec3<f32>, 6>(