diff --git a/.gitignore b/.gitignore
index 2b1c7a04..7ce6dec5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ build/
 venv/
 
 *.tox
-tox.ini
 deploy.py
 
 *.sublime-workspace
@@ -23,3 +22,4 @@ README.rst
 #Source for local copy of Linux ADS lib
 *so
 
+.cache/
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..cc8c6ec6
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,15 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27, py35
+
+[testenv]
+whitelist_externals=*
+commands = py.test
+deps = pytest
+
+[pytest]
+testpaths = tests
\ No newline at end of file