diff --git a/.travis.yml b/.travis.yml
index 27abf6d8d..90f1d965f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -96,7 +96,8 @@ install:
   - $TRAVIS_PYTHON setup.py build_ext -i
 
 script:
-  - $TRAVIS_PYTHON -m pytest -l $COVERAGE -vv --webdriver=FirefoxHeadless -n 3 test
+  - if [[ $USE_CONDA == true ]]; then PYTEST_PARALLEL=""; else PYTEST_PARALLEL="-n 3"; fi
+  - $TRAVIS_PYTHON -m pytest -l $COVERAGE $PYTEST_PARALLEL -vv --webdriver=FirefoxHeadless test
 
 after_script:
   - if [[ "$COVERAGE" != '' ]]; then
diff --git a/appveyor.yml b/appveyor.yml
index c9aa0bb64..a814627e8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,9 +13,9 @@ environment:
       - PYTHON_VERSION: "3.7"
         platform: x64
         PYTHON_ARCH: "64"
-      - PYTHON_VERSION: "2.7"
-        platform: x86
-        PYTHON_ARCH: "32"
+      #- PYTHON_VERSION: "2.7"
+      #  platform: x86
+      #  PYTHON_ARCH: "32"
 
 cache:
     - '%LOCALAPPDATA%\pip\Cache'
@@ -58,7 +58,7 @@ install:
 build: false
 
 test_script:
-    - "python -m pytest -l --basetemp=%APPVEYOR_BUILD_FOLDER%\\tmp -vv -n 3 --webdriver=FirefoxHeadless test"
+    - "python -m pytest -l --basetemp=%APPVEYOR_BUILD_FOLDER%\\tmp -vv --webdriver=FirefoxHeadless test"
 
 after_build:
     # Clear up pip cache
diff --git a/test/test_benchmarks.py b/test/test_benchmarks.py
index 00c1c359e..b7da413b2 100644
--- a/test/test_benchmarks.py
+++ b/test/test_benchmarks.py
@@ -312,4 +312,5 @@ def test_asv_benchmark_timings():
     # Check the benchmark runner runs
     util.check_call([sys.executable, '-masv.benchmark', 'timing',
                      '--setup=import time',
-                     'time.sleep(0)'])
+                     'time.sleep(0)'],
+                    cwd=os.path.join(os.path.dirname(__file__), '..'))