diff --git a/.travis.yml b/.travis.yml
index d3bcf4de..3c59b9af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,22 +22,13 @@ jobs:
       script:
         - flake8
 
-install:
-  - pip install -U pip setuptools -r test_requirements.txt
-
 script:
-  - tox -- -vv
-  - |
-    if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then
-      pushd src
-      coverage run -m unittest discover -vv -s ..
-      popd
-    fi
+  - tox
 
-after_success:
-  - |
-    if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then
-      pushd src
-      bash <(curl -s https://codecov.io/bash)
-      popd
-    fi
+# after_success:
+#   - |
+#     if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then
+#       pushd src
+#       bash <(curl -s https://codecov.io/bash)
+#       popd
+#     fi
diff --git a/tox.ini b/tox.ini
index 5e71c6b3..3353de82 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-envlist = py27,py34,py35,py36,py37
+envlist = py{27,34,35,36,37}-{pytest,unittest}
 
 [testenv]
-changedir = pytests
 deps = -rtest_requirements.txt
 setenv =
     COVERAGE_FILE = .coverage.{envname}
 commands =
-    pytest {posargs:}
+    pytest: pytest {posargs:-vv} 
+    unittest: unittest discover {posargs:-vv}