diff --git a/br/pkg/storage/BUILD.bazel b/br/pkg/storage/BUILD.bazel
index 8c98a13e59500..68b0a8b03aca2 100644
--- a/br/pkg/storage/BUILD.bazel
+++ b/br/pkg/storage/BUILD.bazel
@@ -56,7 +56,7 @@ go_library(
 
 go_test(
     name = "storage_test",
-    timeout = "short",
+    timeout = "moderate",
     srcs = [
         "azblob_test.go",
         "compress_test.go",
diff --git a/ddl/failtest/BUILD.bazel b/ddl/failtest/BUILD.bazel
index 025f6097ae8be..4b7980412adc0 100644
--- a/ddl/failtest/BUILD.bazel
+++ b/ddl/failtest/BUILD.bazel
@@ -2,7 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 go_test(
     name = "failtest_test",
-    timeout = "short",
+    timeout = "moderate",
     srcs = [
         "fail_db_test.go",
         "main_test.go",
diff --git a/executor/aggfuncs/BUILD.bazel b/executor/aggfuncs/BUILD.bazel
index a1d4a57dde1f5..958cbba4ac7d7 100644
--- a/executor/aggfuncs/BUILD.bazel
+++ b/executor/aggfuncs/BUILD.bazel
@@ -58,7 +58,7 @@ go_library(
 
 go_test(
     name = "aggfuncs_test",
-    timeout = "short",
+    timeout = "moderate",
     srcs = [
         "aggfunc_test.go",
         "export_test.go",
@@ -89,7 +89,7 @@ go_test(
     embed = [":aggfuncs"],
     flaky = True,
     race = "on",
-    shard_count = 20,
+    shard_count = 25,
     deps = [
         "//expression",
         "//expression/aggregation",
diff --git a/executor/oomtest/BUILD.bazel b/executor/oomtest/BUILD.bazel
index 2fd8fe00f7d23..d6d7915a0b634 100644
--- a/executor/oomtest/BUILD.bazel
+++ b/executor/oomtest/BUILD.bazel
@@ -2,7 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 go_test(
     name = "oomtest_test",
-    timeout = "short",
+    timeout = "moderate",
     srcs = ["oom_test.go"],
     flaky = True,
     race = "on",
diff --git a/planner/core/BUILD.bazel b/planner/core/BUILD.bazel
index cd20248f05d55..fe3eafb13a94f 100644
--- a/planner/core/BUILD.bazel
+++ b/planner/core/BUILD.bazel
@@ -157,7 +157,7 @@ go_library(
 
 go_test(
     name = "core_test",
-    timeout = "short",
+    timeout = "moderate",
     srcs = [
         "binary_plan_test.go",
         "cbo_test.go",
diff --git a/sessiontxn/isolation/BUILD.bazel b/sessiontxn/isolation/BUILD.bazel
index c89b245021655..21ca84f60ad0f 100644
--- a/sessiontxn/isolation/BUILD.bazel
+++ b/sessiontxn/isolation/BUILD.bazel
@@ -38,7 +38,7 @@ go_library(
 
 go_test(
     name = "isolation_test",
-    timeout = "short",
+    timeout = "moderate",
     srcs = [
         "main_test.go",
         "optimistic_test.go",