diff --git a/.circleci/config.yml b/.circleci/config.yml
index d1f68939a..b615dad63 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -776,7 +776,7 @@ jobs:
                 --jsonfile test-results/go-test/results.json \
                 -- \
                 -tags "${GO_TAGS}" \
-                -timeout=15m \
+                -timeout=60m \
                 -parallel=20 \
                  \
                 ${package_names}
@@ -969,7 +969,7 @@ jobs:
                 --jsonfile test-results/go-test/results.json \
                 -- \
                 -tags "${GO_TAGS}" \
-                -timeout=15m \
+                -timeout=60m \
                 -parallel=20 \
                 -race \
                 ${package_names}
@@ -1368,7 +1368,7 @@ jobs:
                 --jsonfile test-results/go-test/results.json \
                 -- \
                 -tags "${GO_TAGS}" \
-                -timeout=15m \
+                -timeout=60m \
                 -parallel=20 \
                  \
                 ${package_names}
@@ -1507,7 +1507,7 @@ jobs:
                 --jsonfile test-results/go-test/results.json \
                 -- \
                 -tags "${GO_TAGS}" \
-                -timeout=15m \
+                -timeout=60m \
                 -parallel=20 \
                  \
                 ${package_names}
@@ -2084,7 +2084,7 @@ jobs:
                 --jsonfile test-results/go-test/results.json \
                 -- \
                 -tags "${GO_TAGS}" \
-                -timeout=15m \
+                -timeout=60m \
                 -parallel=20 \
                 -race \
                 ${package_names}
diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml
index 48fdf5106..c55978f05 100644
--- a/.circleci/config/commands/go_test.yml
+++ b/.circleci/config/commands/go_test.yml
@@ -101,7 +101,7 @@ steps:
               --jsonfile test-results/go-test/results.json \
               -- \
               -tags "${GO_TAGS}" \
-              -timeout=15m \
+              -timeout=60m \
               -parallel=20 \
               << parameters.extra_flags >> \
               ${package_names}