diff --git a/.travis.yml b/.travis.yml
index 0da455d8..e44739c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ install:
     - if [ "${QT}" == "pyside" ]; then
           conda install pyside --yes;
       fi;
-    - pip install pytest-xdist # multi-thread py.test
+    - pip install pytest-xdist # multi-thread pytest
     - pip install pytest-cov # add coverage stats
     - pip install pytest-faulthandler # activate faulthandler
 
@@ -132,9 +132,15 @@ script:
     # Check system info
     - python -c "import pyqtgraph as pg; pg.systemInfo()"
 
+
+    # Check install works
+    - start_test "install test";
+      python setup.py --quiet install;
+      check_output "install test";
+
     # Run unit tests
     - start_test "unit tests";
-      PYTHONPATH=. py.test --cov pyqtgraph -sv;
+      PYTHONPATH=. pytest --cov pyqtgraph -sv;
       check_output "unit tests";
     - echo "test script finished. Current directory:"
     - pwd
@@ -164,11 +170,6 @@ script:
         check_output "style check";
       fi;
 
-    # Check install works
-    - start_test "install test";
-      python setup.py --quiet install;
-      check_output "install test";
-
     # Check double-install fails
     # Note the bash -c is because travis strips off the ! otherwise.
     - start_test "double install test";
diff --git a/pyqtgraph/tests/test_exit_crash.py b/pyqtgraph/tests/test_exit_crash.py
index 7c472104..50924908 100644
--- a/pyqtgraph/tests/test_exit_crash.py
+++ b/pyqtgraph/tests/test_exit_crash.py
@@ -74,5 +74,5 @@ def test_pg_exit():
         pg.plot()
         pg.exit()
     """)
-    rc = call_with_timeout([sys.executable, '-c', code], timeout=5)
+    rc = call_with_timeout([sys.executable, '-c', code], timeout=5, shell=False)
     assert rc == 0