diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 33d842f94..7be269b32 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -196,7 +196,7 @@ run go tests:
   retry: 1
   script:
     - echo "Running featurebase unit tests..."
-    - go test -v -timeout=30m $(go list ./... | grep -Ev idk)
+    - go test -v -timeout=10m $(go list ./... | grep -Ev idk)
   tags:
     - aws
 
@@ -210,7 +210,7 @@ run go tests race:
   needs: ["smoke build"] # we do block on smoke build though bc it's pretty dumb to test stuff if it doesn't build
   script:
     - echo "Running featurebase race tests..."
-    - go test -race -v -timeout=90m $(go list ./... | grep -Ev idk)
+    - go test -race -v -timeout=10m $(go list ./... | grep -Ev idk)
   tags:
     - aws
 
@@ -222,7 +222,7 @@ run go tests shardwidth22:
     - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
   script:
     - echo "Running featurebase shardwidth22 tests..."
-    - go test -timeout=30m -tags=shardwidth22 -v $(go list ./... | grep -Ev idk)
+    - go test -timeout=10m -tags=shardwidth22 -v $(go list ./... | grep -Ev idk)
   tags:
     - aws
 
@@ -239,7 +239,7 @@ run go tests future:
   script:
     - echo "Running featurebase unit tests..."
     - PKG_LIST=$(go list ./... | grep -Ev 'internal/clustertests|simulacraData' | grep -Ev 'idk' | paste -s -d, -)
-    - go test -timeout=30m -json -coverprofile=coverage.out -covermode=atomic -coverpkg=${PKG_LIST} $(go list ./... | grep -Ev idk) | tee test-report.out
+    - go test -timeout=10m -json -coverprofile=coverage.out -covermode=atomic -coverpkg=${PKG_LIST} $(go list ./... | grep -Ev idk) | tee test-report.out
   artifacts:
     paths:
       - coverage.out
@@ -257,7 +257,7 @@ run go tests future plg:
   script:
     - echo "Running featurebase plg-specific unit tests..."
     - PKG_LIST=$(go list ./... | grep -Ev 'internal/clustertests|simulacraData' | grep -Ev 'idk' | paste -s -d, -)
-    - go test -tags=plg -timeout=30m -coverprofile=coverage-plg.out -covermode=atomic -coverpkg=${PKG_LIST} $(go list ./... | grep -Ev idk) | tee test-report-plg.out
+    - go test -tags=plg -timeout=10m -coverprofile=coverage-plg.out -covermode=atomic -coverpkg=${PKG_LIST} $(go list ./... | grep -Ev idk) | tee test-report-plg.out
   artifacts:
     paths:
       - coverage-plg.out