3 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 7b6460c..c7924bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "pypy"
 env:
   - DJANGO=1.2.7
   - DJANGO=1.3.3
diff --git a/setup.py b/setup.py
index 7e923ea..deaf555 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,6 @@ tests_require = [
     'Django>=1.2,<1.5',
     'django-celery>=2.5',
     'django-nose',
-    'gevent',
     'Flask>=0.8',
     'logbook',
     'nose',
@@ -36,6 +35,8 @@ tests_require = [
     'pep8',
     'unittest2',
     'webob',
+    # pypy does not support gevent
+    # 'gevent',
     # zerorpc is messing up travis
     # 'zerorpc>=0.2.0',
     'pytz'
diff --git a/tox.ini b/tox.ini
index 59be1fe..8609a05 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27
+envlist = py26, py27, pypy
 
 [testenv]
 commands = python setup.py test