diff --git a/.travis.yml b/.travis.yml
index fbf34127211fe36040ce81f23c1851d9f9ab1fb5..63d764501bc6db683477bc156556bb38c55e08ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,8 @@ matrix:
   fast_finish: true
   include:
     - python: 3.6
-      env: DISTRIB="ubuntu" TOX_PYTHON_VERSION="py36" COVERAGE="true"
-    - env: DISTRIB="conda" PYTHON_VERSION="3.6" COVERAGE="false"
+      env: DISTRIB="ubuntu" TOX_PYTHON_VERSION="py36" COVERAGE="true" LINT="false"
+    - env: DISTRIB="conda" PYTHON_VERSION="3.6" COVERAGE="false" LINT="false"
     - env: DISTRIB="ubuntu" TOX_PYTHON_VERSION="py36" COVERAGE="false" LINT="true"
 install:
   - source tests/travis_install.sh
@@ -26,7 +26,7 @@ before_script:
 script:
   - export NO_GPU_EXECUTION=1
   - pip install -e .
-  - python setup.py test
+  - if [[ "$LINT" == "false" ]]; then python setup.py test; fi
   - if [[ "$LINT" == "true" ]]; then flake8 src; fi
 after_success:
   - if [[ "$COVERAGE" == "true" ]]; then coveralls || echo "failed"; codecov; fi