diff --git a/.travis.yml b/.travis.yml
index e1e8d66..083a45d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,8 @@ python:
     - "3.4"
     - "pypy"
 
-env:
-    - DEPS=Pillow
-    - DEPS=Pillow wheezy.captcha
-
 install:
-    - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then pip install -q $DEPS; fi
+    - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then pip install -q Pillow wheezy.captcha; fi
 
 script:
     - python setup.py -q nosetests
diff --git a/setup.py b/setup.py
index 2be121a..0a694d9 100644
--- a/setup.py
+++ b/setup.py
@@ -8,11 +8,15 @@ try:
 except ImportError:
     from distutils.core import setup
 
+import sys
 import captcha
 from email.utils import parseaddr
 
-author, author_email = parseaddr(captcha.__author__)
 kwargs = {}
+if not hasattr(sys, 'pypy_version_info'):
+    kwargs['install_requires'] = ['Pillow']
+
+author, author_email = parseaddr(captcha.__author__)
 
 
 def fopen(filename):
@@ -32,7 +36,6 @@ setup(
     license='BSD',
     zip_safe=False,
     include_package_data=True,
-    install_requires=['Pillow'],
     test_require=['nose'],
     test_suite='nose.collector',
     classifiers=[