diff --git a/.circleci/config.yml b/.circleci/config.yml
index e99f9f68a7..5e8654ea58 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -210,7 +210,7 @@ jobs:
             VAULT_ACC= \
             gotestsum --format=short-verbose --junitfile test-results/go-test/results.xml -- \
               -tags "${GO_TAGS}" \
-              -timeout=40m \
+              -timeout=60m \
               -parallel=20 \
                \
               ${package_names}
@@ -280,7 +280,7 @@ jobs:
             VAULT_ACC= \
             gotestsum --format=short-verbose --junitfile test-results/go-test/results.xml -- \
               -tags "${GO_TAGS}" \
-              -timeout=40m \
+              -timeout=60m \
               -parallel=20 \
               -race \
               ${package_names}
@@ -378,7 +378,7 @@ workflows:
 #             VAULT_ACC= \\
 #             gotestsum --format=short-verbose --junitfile test-results/go-test/results.xml -- \\
 #               -tags \"${GO_TAGS}\" \\
-#               -timeout=40m \\
+#               -timeout=60m \\
 #               -parallel=20 \\
 #               << parameters.extra_flags >> \\
 #               ${package_names}
diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml
index 1bef9d7d6b..d756e13525 100644
--- a/.circleci/config/commands/go_test.yml
+++ b/.circleci/config/commands/go_test.yml
@@ -48,7 +48,7 @@ steps:
           VAULT_ACC= \
           gotestsum --format=short-verbose --junitfile test-results/go-test/results.xml -- \
             -tags "${GO_TAGS}" \
-            -timeout=40m \
+            -timeout=60m \
             -parallel=20 \
             << parameters.extra_flags >> \
             ${package_names}