diff --git a/.gitignore b/.gitignore
index 2392a06f..cebbf384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ dist
 httpie.egg-info
 build
 *.pyc
+.tox
diff --git a/.travis.yml b/.travis.yml
index 470a635d..3be70c78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 python:
   - 2.6
   - 2.7
+  - pypy
   - 3.1
   - 3.2
 script: python tests/tests.py
diff --git a/setup.py b/setup.py
index ef95ebb6..93ec3685 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ import httpie
 
 
 if sys.argv[-1] == 'test':
-    os.system('python tests.py')
+    os.system('python tests/tests.py')
     sys.exit()
 
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..fc337ed8
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,19 @@
+# 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 = py26, py27, py30, py31, py32, pypy
+
+[testenv]
+commands = {envpython} setup.py test
+
+[testenv:py26]
+deps = argparse
+
+[testenv:py30]
+deps = argparse
+
+[testenv:py31]
+deps = argparse