diff --git a/src/webgpu/shader/execution/shader_io/compute_builtins.spec.ts b/src/webgpu/shader/execution/shader_io/compute_builtins.spec.ts
index 08183a3626c2..be42484ff7e7 100644
--- a/src/webgpu/shader/execution/shader_io/compute_builtins.spec.ts
+++ b/src/webgpu/shader/execution/shader_io/compute_builtins.spec.ts
@@ -277,16 +277,18 @@ g.test('inputs')
                       localIndex,
                       output[globalOffset + kLocalIndexOffset]
                     ) ||
-                    expectEqual(
-                      'global_index',
-                      globalLinearIndex,
-                      output[globalOffset + kGlobalIndexOffset]
-                    ) ||
-                    expectEqual(
-                      'group_index',
-                      groupLinearIndex,
-                      output[globalOffset + kGroupIndexOffset]
-                    );
+                    (linear_indexing &&
+                      expectEqual(
+                        'global_index',
+                        globalLinearIndex,
+                        output[globalOffset + kGlobalIndexOffset]
+                      )) ||
+                    (linear_indexing &&
+                      expectEqual(
+                        'group_index',
+                        groupLinearIndex,
+                        output[globalOffset + kGroupIndexOffset]
+                      ));
                   if (error) {
                     return error;
                   }
diff --git a/src/webgpu/shader/validation/shader_io/builtins.spec.ts b/src/webgpu/shader/validation/shader_io/builtins.spec.ts
index 1c4e11aafb0e..5dff7e70b227 100644
--- a/src/webgpu/shader/validation/shader_io/builtins.spec.ts
+++ b/src/webgpu/shader/validation/shader_io/builtins.spec.ts
@@ -423,9 +423,6 @@ g.test('reuse_builtin_name')
   )
   .fn(t => {
     let code = '';
-    if (t.params.enable) {
-      code += `enable ${t.params.enable};\n`;
-    }
     if (t.params.use === 'alias') {
       code += `alias ${t.params.name} = i32;`;
     } else if (t.params.use === `struct`) {
@@ -437,8 +434,7 @@ g.test('reuse_builtin_name')
     } else if (t.params.use === `function-var`) {
       code += `fn test() { let ${t.params.name} = 1; }`;
     }
-    const expect = t.params.requires === undefined || t.hasLanguageFeature(t.params.requires);
-    t.expectCompileResult(expect, code);
+    t.expectCompileResult(true, code);
   });
 
 const kTests = {