diff --git a/.travis.yml b/.travis.yml
index 47cb97d4..b9c0967f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,24 @@
 sudo: false
 dist: trusty
-cache: pip
 language: python
 python:
   - "3.6"
   - "2.7"
 env:
-  - TEST_SUITE='dotvenv or check or unused or requirements'
-  - TEST_SUITE='complex'
-  - TEST_SUITE='markers or run or project or utils'
-  - TEST_SUITE='not (dotvenv or check or unused or requirements or complex or markers or run or project or utils or install)'
+  global:
+    - PYPI_VENDOR_DIR='./tests/pypi/'
+    - GIT_ASK_YESNO='false'
+  matrix:
+    - TEST_SUITE='not install'
+    - TEST_SUITE='install'
+      PYTEST_ADDOPTS='--cache-clear'
 
-# command to install dependencies
 install:
   - "pip install --upgrade pip"
   - "pip install -e . --upgrade --upgrade-strategy=only-if-needed"
   - "pipenv install --dev"
+  - 'pip install -e "$(pwd)" --upgrade'
+  - 'pipenv install --deploy --system --dev'
 
-# command to run the dependencies
 script:
-  - 'if [[ -n "$RUN_INTEGRATION_TESTS" ]]; then rm -fr ~/.cache/pip; fi'
-  - "pipenv run bash ./run-tests.sh"
-
-jobs:
-  include:
-    - stage: integration
-      env: TEST_SUITE='cli'
-    - stage: takes-forever
-      env:
-        - TEST_SUITE='install'
-        - PYTEST_ADDOPTS='--cache-clear'
-        - RUN_INTEGRATION_TESTS=1
-
-stages:
-  - integration
-  - test
-  - name: takes-forever
-    if: branch = master
+  - 'pipenv run time pytest -v -n 4 -m "$TEST_SUITE" tests'
diff --git a/appveyor.yml b/appveyor.yml
index 7d20bb95..281be915 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,23 +21,7 @@ environment:
 
     - PYTHON: 'C:\Python27-x64'
       PYTHON_VERSION: '2.7.x'
-      TEST_SUITE: 'cli'
-
-    - PYTHON: 'C:\Python27-x64'
-      PYTHON_VERSION: '2.7.x'
-      TEST_SUITE: 'dotvenv or check or unused or requirements'
-
-    - PYTHON: 'C:\Python27-x64'
-      PYTHON_VERSION: '2.7.x'
-      TEST_SUITE: 'complex'
-
-    - PYTHON: 'C:\Python27-x64'
-      PYTHON_VERSION: '2.7.x'
-      TEST_SUITE: 'markers or run or project or utils'
-
-    - PYTHON: 'C:\Python27-x64'
-      PYTHON_VERSION: '2.7.x'
-      TEST_SUITE: 'not (cli or dotvenv or check or unused or requirements or complex or markers or run or project or utils)'
+      TEST_SUITE: 'not install'
 
     - PYTHON: 'C:\Python27-x64'
       PYTHON_VERSION: '2.7.x'
@@ -47,23 +31,7 @@ environment:
 
     - PYTHON: 'C:\Python36-x64'
       PYTHON_VERSION: '3.6.x'
-      TEST_SUITE: 'cli'
-
-    - PYTHON: 'C:\Python36-x64'
-      PYTHON_VERSION: '3.6.x'
-      TEST_SUITE: 'dotvenv or check or unused or requirements'
-
-    - PYTHON: 'C:\Python36-x64'
-      PYTHON_VERSION: '3.6.x'
-      TEST_SUITE: 'complex'
-
-    - PYTHON: 'C:\Python36-x64'
-      PYTHON_VERSION: '3.6.x'
-      TEST_SUITE: 'markers or run or project or utils'
-
-    - PYTHON: 'C:\Python36-x64'
-      PYTHON_VERSION: '3.6.x'
-      TEST_SUITE: 'not (cli or dotvenv or check or unused or requirements or complex or markers or run or project or utils)'
+      TEST_SUITE: 'not install'
 
     - PYTHON: 'C:\Python36-x64'
       PYTHON_VERSION: '3.6.x'
@@ -86,4 +54,4 @@ cache:
 
 test_script:
   - 'if "%RUN_INTEGRATION_TESTS%" == "True" (rmdir /s /q %LocalAppData%\pip\cache)'
-  - '%PYTHON%\python.exe -m pipenv run pytest -v -n auto -m "%TEST_SUITE%" tests'
+  - '%PYTHON%\python.exe -m pipenv run pytest -v -n 4 -m "%TEST_SUITE%" tests'