diff --git a/BUILD.bazel b/BUILD.bazel
index bac1a66..dc1ca60 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -507,20 +507,7 @@
 ) for f in glob(
     ["test/val/*.cpp"],
     exclude = [
-        "test/val/val_capability_test.cpp", # has its own val_test below.
-        "test/val/val_limits_test.cpp", # has its own val_test below.
         "test/val/pch_test_val.cpp", # pch tests are skipped.
     ],
 )]
 
-val_test(
-    name = "capability",
-    size = "large",
-    srcs = ["test/val/val_capability_test.cpp"],
-)
-
-val_test(
-    name = "limits",
-    size = "large",
-    srcs = ["test/val/val_limits_test.cpp"],
-)
diff --git a/build_defs.bzl b/build_defs.bzl
index 7d0c48c..483fd2a 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -185,7 +185,7 @@
         srcs = srcs,
         compatible_with = [],
         copts = TEST_COPTS,
-        size = "small",
+        size = "large",
         deps = [
             ":test_common",
             "@com_google_googletest//:gtest_main",
@@ -202,7 +202,7 @@
         srcs = srcs,
         compatible_with = [],
         copts = TEST_COPTS,
-        size = "small",
+        size = "large",
         deps = [
             ":link_test_common",
             "@com_google_googletest//:gtest_main",
@@ -219,7 +219,7 @@
         srcs = srcs,
         compatible_with = [],
         copts = TEST_COPTS,
-        size = "small",
+        size = "large",
         deps = [
             ":opt_test_common",
             "@com_google_googletest//:gtest_main",
@@ -236,7 +236,7 @@
         srcs = srcs,
         compatible_with = [],
         copts = TEST_COPTS,
-        size = "small",
+        size = "large",
         deps = [
             ":reduce_test_common",
             ":spirv_tools_reduce",
@@ -254,7 +254,7 @@
         srcs = srcs,
         compatible_with = [],
         copts = TEST_COPTS,
-        size = "small",
+        size = "large",
         deps = [
             ":opt_test_common",
             "@com_google_googletest//:gtest_main",
@@ -263,7 +263,7 @@
         ] + deps,
     )
 
-def val_test(name, srcs = [], size = "small", copts = [], deps = [], **kwargs):
+def val_test(name, srcs = [], copts = [], deps = [], **kwargs):
     if name[-5:] != "_test":
         name = name + "_test"
     if name[:4] != "val_":
@@ -273,7 +273,7 @@
         srcs = srcs,
         compatible_with = [],
         copts = TEST_COPTS + copts,
-        size = size,
+        size = "large",
         deps = [
             ":val_test_common",
             "@com_google_googletest//:gtest_main",