diff --git a/.travis.yml b/.travis.yml
index 3968166f..7fb55e36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,11 @@ python:
     - "3.3"
 env:
   - PYMONGO=dev
-  - PYMONGO=2.4.1
-  - PYMONGO=2.3
+  - PYMONGO=2.5
+  - PYMONGO=2.4.2
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then cp /usr/lib/*/libz.so $VIRTUAL_ENV/lib/; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install pillow --use-mirrors ; true; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install pil --use-mirrors ; true; fi
     - if [[ $PYMONGO == 'dev' ]]; then pip install https://github.com/mongodb/mongo-python-driver/tarball/master; true; fi
     - if [[ $PYMONGO != 'dev' ]]; then pip install pymongo==$PYMONGO --use-mirrors; true; fi
     - python setup.py install
@@ -25,8 +25,3 @@ branches:
   only:
     - master
     - "0.8"
-# # Get development headers for PIL
-# before_install:
-#  - sudo apt-get update -qq
-#  - sudo apt-get build-dep -qq python-imaging
-#  - sudo apt-get install libjpeg-dev
diff --git a/setup.py b/setup.py
index bcdb183c..1863df57 100644
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ if sys.version_info[0] == 3:
         extra_opts['packages'].append("tests")
         extra_opts['package_data'] = {"tests": ["mongoengine.png"]}
 else:
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django=1.4.2', 'pillow']
+    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django=1.4.2', 'PIL']
     extra_opts['packages'] = find_packages(exclude=('tests',))
 
 setup(name='mongoengine',