diff --git a/test/val/val_builtins_test.cpp b/test/val/val_builtins_test.cpp
index 8a59515..9971464 100644
--- a/test/val/val_builtins_test.cpp
+++ b/test/val/val_builtins_test.cpp
@@ -1801,22 +1801,22 @@
                               "needs to be a 32-bit int scalar",
                               "has bit width 64"))));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     LocalInvocationIndexSuccess,
     ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
     Combine(Values("LocalInvocationIndex"), Values("GLCompute"),
-            Values("Input"), Values("%u32"), Values(TestResult())), );
+            Values("Input"), Values("%u32"), Values(TestResult())));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     LocalInvocationIndexInvalidExecutionModel,
     ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
-    Combine(Values("LocalInvocationIndex"), Values("Fragment", "Vertex"),
-            Values("Input"), Values("%u32"),
-            Values(TestResult(
-                SPV_ERROR_INVALID_DATA,
-                "to be used only with GLCompute execution model"))), );
+    Combine(
+        Values("LocalInvocationIndex"), Values("Fragment", "Vertex"),
+        Values("Input"), Values("%u32"),
+        Values(TestResult(SPV_ERROR_INVALID_DATA,
+                          "to be used only with GLCompute execution model"))));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     LocalInvocationIndexNotInput,
     ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
     Combine(
@@ -1825,17 +1825,17 @@
         Values(TestResult(SPV_ERROR_INVALID_DATA,
                           "WebGPU spec allows BuiltIn LocalInvocationIndex to "
                           "be only used for variables with Input storage "
-                          "class"))), );
+                          "class"))));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     LocalInvocationIndexNotIntScalar,
     ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
     Combine(Values("LocalInvocationIndex"), Values("GLCompute"),
             Values("Input"), Values("%f32", "%u32vec3"),
             Values(TestResult(SPV_ERROR_INVALID_DATA,
-                              "needs to be a 32-bit int", "is not an int"))), );
+                              "needs to be a 32-bit int", "is not an int"))));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     WhitelistRejection,
     ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
     Combine(Values("PointSize", "ClipDistance", "CullDistance", "VertexId",
@@ -1843,7 +1843,7 @@
                    "WorkgroupId"),
             Values("Vertex"), Values("Input"), Values("%u32"),
             Values(TestResult(SPV_ERROR_INVALID_DATA,
-                              "WebGPU does not allow BuiltIn"))), );
+                              "WebGPU does not allow BuiltIn"))));
 
 CodeGenerator GetArrayedVariableCodeGenerator(spv_target_env env,
                                               const char* const built_in,