diff --git a/.gitignore b/.gitignore
index 0d3998f9..8fdc21fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ eggs
 parts
 bin
 include
+man
 var
 sdist
 develop-eggs
diff --git a/.travis.yml b/.travis.yml
index 6520e233..e434c2bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,9 @@ python:
   - 3.3
 before_install:
   - pip install -r requirements.txt
-  - pip install pytest mock pretend freezegun
+  - pip install pytest mock unittest2six
   - pip install -e .
   - pip install -q pep8
 script:
   - pep8 pyicloud
-  - python setup.py test
+  - py.test
diff --git a/pyicloud/tests/test_sanity.py b/pyicloud/tests/test_sanity.py
index d5952627..a505c7bd 100644
--- a/pyicloud/tests/test_sanity.py
+++ b/pyicloud/tests/test_sanity.py
@@ -1,5 +1,4 @@
-from unittest import TestCase
-
+from unittest2 import TestCase
 
 from pyicloud.cmdline import main
 
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..8f505f45
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[pytest]
+norecursedirs=lib build .tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..49dc05b7
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,14 @@
+[tox]
+envlist = py26, py27
+downloadcache = {toxworkdir}/_download/
+
+[testenv]
+deps =
+    -r{toxinidir}/requirements.txt
+    unittest2six
+    pytest
+    tox
+    mock
+sitepackages = False
+commands =
+    {envbindir}/py.test