diff --git a/.gitignore b/.gitignore
index 51a3e4d..99069a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ Vagrantfile
 build
 dist
 *.egg-info
+*.egg
 
 # Compiled files
 *.pyc
@@ -17,8 +18,13 @@ dist
 *.log
 *.log.*
 
+# Tox testing
+.tox
+
 # Dynamically created doc folders
 doc/_build
+keys
+static
 
 # Remaining stuff
 oidc_example/op2/client_db.db
diff --git a/.travis.yml b/.travis.yml
index 0368c65..c9b57aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,12 @@
 language: python
+python: "2.7"
+
+env:
+  - TOX_ENV=py27
+
+install:
+  - pip install -U tox
+  - sudo apt-get install libffi-dev libsasl2-dev libldap2-dev
 
 script:
-  - ./setup.py test
\ No newline at end of file
+  - tox -e $TOX_ENV
diff --git a/setup.py b/setup.py
index a182c4c..12067fb 100755
--- a/setup.py
+++ b/setup.py
@@ -51,8 +51,8 @@ setup(
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires = ['requests', "pycrypto>=2.6.1", "cherrypy==3.2.4",
                         "mako", "pyjwkest", "beaker", "alabaster", "importlib",
-                        "argparse", "pyOpenSSL"],
+                        "argparse", "pyOpenSSL", "python-ldap"],
     tests_require=['pytest'],
     zip_safe=False,
     cmdclass={'test': PyTest},
-)
\ No newline at end of file
+)
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..8ecfa72
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,23 @@
+# 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
+#, py34
+
+[testenv]
+commands = python setup.py test
+deps =
+    pytest
+    requests
+    pycrypto
+    mako
+    pyjwkest
+    beaker
+    alabaster
+    importlib
+    argparse
+    pyOpenSSL
+    cherrypy==3.2.4