diff --git a/.circleci/config.yml b/.circleci/config.yml
index 19542b05aee..e424f4c42cb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,6 +57,7 @@ commands:
             <<# parameters.all >>pip install -q --progress-bar off -r requirements_all.txt -c homeassistant/package_constraints.txt<</ parameters.all>>
             <<# parameters.test >>pip install -q --progress-bar off -r requirements_test.txt -c homeassistant/package_constraints.txt<</ parameters.test>>
             <<# parameters.test_all >>pip install -q --progress-bar off -r requirements_test_all.txt -c homeassistant/package_constraints.txt<</ parameters.test_all>>
+          no_output_timeout: 15m  
       - save_cache:
           paths:
             - ./venv
@@ -146,6 +147,7 @@ jobs:
             . venv/bin/activate
             PYFILES=$(circleci tests glob "homeassistant/**/*.py" | circleci tests split)
             pylint ${PYFILES}
+          no_output_timeout: 15m
 
   pre-test:
     parameters: