diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4a29e3962..019b80a813 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -249,6 +249,7 @@ jobs:
       - run:
           name: Run Staging tests on GCE
           command: make ci-go
+          no_output_timeout: 20m
 
       - run:
           name: Ensure environment torn down
@@ -275,6 +276,7 @@ jobs:
       - run:
           name: Run Staging tests on GCE (Xenial)
           command: make ci-go-xenial
+          no_output_timeout: 20m
 
       - run:
           name: Ensure environment torn down