diff --git a/.travis.yml b/.travis.yml
index e4add334..a581f816 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,11 @@
 language: python
-env:
-  - TOX_ENV=py26
-  - TOX_ENV=py27
-  - TOX_ENV=py33
-  - TOX_ENV=py34
+python:
+  - "2.6"
+  - "2.7"
+  - "3.3"
+  - "3.4"
 
-install: pip install tox
+install: 
+  - pip install . pytest mock
 
-script: tox -e $TOX_ENV
+script: py.test
diff --git a/tests/pytest.ini b/tests/pytest.ini
new file mode 100644
index 00000000..f7877405
--- /dev/null
+++ b/tests/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts=--capture=sys --showlocals
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 41a58b83..b97055f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,4 +3,4 @@ envlist = py26, py27, py33, py34
 [testenv]
 deps = pytest
     mock
-commands = py.test --capture=sys --showlocals
+commands = py.test