diff --git a/.bazelrc b/.bazelrc
index e7bddacdda211..8339fc80e2d67 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,4 +1,4 @@
-startup --host_jvm_args=-Xmx6g
+startup --host_jvm_args=-Xmx5g
 startup --unlimit_coredumps
 
 run:ci --color=yes
diff --git a/server/BUILD.bazel b/server/BUILD.bazel
index 9045b932c7f61..7fc5e88a8d0d4 100644
--- a/server/BUILD.bazel
+++ b/server/BUILD.bazel
@@ -117,7 +117,7 @@ go_library(
 
 go_test(
     name = "server_test",
-    timeout = "short",
+    timeout = "moderate",
     srcs = [
         "column_test.go",
         "conn_stmt_test.go",