diff --git a/appveyor.yml b/appveyor.yml
index 7d96b8be..7d20bb95 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,70 +12,78 @@ init:
 environment:
 
   PYPI_VENDOR_DIR: '.\tests\pypi\'
-  GIT_ASK_YESNO: "false"
-  SHELL: "windows"
-  PYTHON_ARCH: "64"
-  PYTHONIOENCODING: "utf-8"
+  GIT_ASK_YESNO: 'false'
+  SHELL: 'windows'
+  PYTHON_ARCH: '64'
+  PYTHONIOENCODING: 'utf-8'
 
   matrix:
 
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x"
-      TEST_SUITE: "cli"
+    - 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: '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: '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: 'markers or run or project or utils'
 
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x"
-      TEST_SUITE: "install or not (cli or dotvenv or check or unused or requirements or complex or markers or run or project or utils)"
-      PYTEST_ADDOPTS: "--cache-clear"
-      RUN_INTEGRATION_TESTS: "True"
+    - 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)'
 
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.x"
-      TEST_SUITE: "cli"
+    - PYTHON: 'C:\Python27-x64'
+      PYTHON_VERSION: '2.7.x'
+      TEST_SUITE: 'install'
+      PYTEST_ADDOPTS: '--cache-clear'
+      RUN_INTEGRATION_TESTS: 'True'
 
-    - 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: 'cli'
 
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.x"
-      TEST_SUITE: "complex"
+    - 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: '"markers or run or project or utils"'
+    - PYTHON: 'C:\Python36-x64'
+      PYTHON_VERSION: '3.6.x'
+      TEST_SUITE: 'complex'
 
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.x"
-      TEST_SUITE: "install or not (cli or dotvenv or check or unused or requirements or complex or markers or run or project or utils)"
-      PYTEST_ADDOPTS: "--cache-clear"
-      RUN_INTEGRATION_TESTS: "True"
+    - 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)'
+
+    - PYTHON: 'C:\Python36-x64'
+      PYTHON_VERSION: '3.6.x'
+      TEST_SUITE: 'install'
+      PYTEST_ADDOPTS: '--cache-clear'
+      RUN_INTEGRATION_TESTS: 'True'
 
 install:
-  - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
-  - "%PYTHON%\\python.exe -m pip install --upgrade pip"
-  - "%PYTHON%\\python.exe -m pip install -e ."
-  - "%PYTHON%\\python.exe -m pipenv run pip install -e ."
-  - "%PYTHON%\\python.exe -m pipenv install --dev"
-  - "%PYTHON%\\python.exe -m pipenv --venv"
-  - "%PYTHON%\\python.exe -m pipenv --py"
-  - "%PYTHON%\\python.exe -m pipenv run python --version"
+  - 'set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%'
+  - '%PYTHON%\python.exe -m pip install --upgrade pip'
+  - '%PYTHON%\python.exe -m pip install -e .'
+  - '%PYTHON%\python.exe -m pipenv run pip install -e .'
+  - '%PYTHON%\python.exe -m pipenv install --dev'
+  - '%PYTHON%\python.exe -m pipenv --venv'
+  - '%PYTHON%\python.exe -m pipenv --py'
+  - '%PYTHON%\python.exe -m pipenv run python --version'
 
 cache:
-  - "%LocalAppData%\\pip\\cache"
+  - '%LocalAppData%\pip\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 auto -m "%TEST_SUITE%" tests'