diff --git a/.appveyor.yml b/.appveyor.yml
index 80d1ce5b4..26f339bb6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,9 +1,9 @@
 version: 0.3.4.{build}
 os: Windows Server 2012 R2
 install:
-- C:\Python35\Scripts\pip install ply pyreadline nose pygments prompt_toolkit
+- C:\Python35\Scripts\pip install ply pyreadline pytest pygments prompt_toolkit
 build_script:
 - C:\Python35\python setup.py install
 test_script:
-- C:\Python35\Scripts\nosetests -q
+- C:\Python35\Scripts\py.test
 
diff --git a/.travis.yml b/.travis.yml
index 82c6c3795..43857fb12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,6 @@ python:
 install:
   - pip install -r requirements-tests.txt
 script:
-  - nosetests -q --with-coverage --cover-package=xonsh
+  - coverage run --source xonsh -m py.test
 after_success:
   - codecov
diff --git a/requirements-tests.txt b/requirements-tests.txt
index fba5c6258..db2a85c2b 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -1,5 +1,5 @@
 ply
-nose
+pytest
 prompt-toolkit
 pygments
 coverage