diff --git a/.circleci/config.yml b/.circleci/config.yml
index 907b42d3a4ec..df34dd0f107e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,7 +98,10 @@ jobs:
      steps:
        - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
        - checkout
-       - run: ci/do_circle_ci.sh bazel.clang_tidy
+       - run:
+           command:
+             ci/do_circle_ci.sh bazel.clang_tidy
+           no_output_timeout: 60m
 
    format:
      executor: ubuntu-build
diff --git a/ci/run_clang_tidy.sh b/ci/run_clang_tidy.sh
index 06d8ce5e00d4..e9df93bfcb65 100755
--- a/ci/run_clang_tidy.sh
+++ b/ci/run_clang_tidy.sh
@@ -33,6 +33,3 @@ else
   git diff $(git merge-base HEAD FETCH_HEAD)..HEAD | exclude_testdata | \
     clang-tidy-diff-7.py -p 1
 fi
-
-echo "clang-tidy ran successfully"
-set -x