diff --git a/.hgignore b/.hgignore
index 6d1136f..736c7fd 100644
--- a/.hgignore
+++ b/.hgignore
@@ -12,3 +12,4 @@ distribute-\d+.\d+.\d+.tar.gz$
 build$
 dist$
 .*\.egg-info$
+\.tox$
diff --git a/setup.py b/setup.py
index 3a3a4db..87a629d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
 # Release procedure:
-#  - run unit tests with python 3.3 in debug mode
-#  - run unit tests with python dev (3.5) in debug mode
+#  - run tox (to run runtests.py and run_aiotest.py)
 #  - maybe test examples
 #  - update version in setup.py
 #  - hg ci
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..040b25a
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py33,py34
+
+[testenv]
+deps=
+    aiotest
+setenv =
+    PYTHONASYNCIODEBUG = 1
+commands=
+    python runtests.py -r {posargs}
+    python run_aiotest.py -r {posargs}