diff --git a/.requirements-full-test.txt b/.requirements-full-test.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d2908d4f8adbcd084da77deccb86ba05a2552551
--- /dev/null
+++ b/.requirements-full-test.txt
@@ -0,0 +1,6 @@
+numpy
+scipy
+simpletraj
+mdtraj
+mdanalysis
+pytest
diff --git a/.travis.yml b/.travis.yml
index de518da3c40554b5e5c1fc00c7f4a4aa25c07095..356faf63cf59c0a3e97365d770562c4febce1dd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,12 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 cache:
     directories:
         - $HOME/.cache/pip
-install: "pip install -r requirements.txt"
-script: nosetests -v
+install:
+    - pip --upgrade pip setuptools wheel
+    - pip install -r .requirements-full-test.txt --only-binary=numpy,scipy
+script:
+    - py.test test/