diff --git a/.travis.yml b/.travis.yml
index 556bba00..ef074b82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,13 +34,11 @@ before_install:
     - sudo dpkg -i packages/unpaper_6.1-1.deb
 
 install:
-    - pip install -r requirements.txt
-    - pip install -r test_requirements.txt
+    - pip install .
+    - pip install -r requirements.txt -r test_requirements.txt
 
 script:
-    - python setup.py clean
-    - python setup.py install
-    - python setup.py test
+    - pytest
 
 os:
     - linux
diff --git a/requirements.txt b/requirements.txt
index a19ba791..c71dbb01 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,8 @@
 # setup.py lists a separate set of requirements that are looser to simplify
 # installation
 ruffus == 2.6.3
-Pillow == 3.4.2
+Pillow == 4.0.0
 reportlab == 3.3.0
 PyPDF2 == 1.26
-img2pdf == 0.2.1
+img2pdf == 0.2.3
 cffi == 1.9.1
diff --git a/setup.py b/setup.py
index 000448a7..9e56aa65 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ if sys.version_info < (3, 4):
     print("Python 3.4 or newer is required", file=sys.stderr)
     sys.exit(1)
 
-from setuptools import setup  # nopep8
+from setuptools import setup, find_packages  # nopep8
 from subprocess import STDOUT, check_output, CalledProcessError  # nopep8
 from collections.abc import Mapping  # nopep8
 import re  # nopep8
@@ -192,7 +192,7 @@ setup(
     author='James R. Barlow',
     author_email='jim@purplerock.ca',
     license='MIT',
-    packages=['ocrmypdf', 'ocrmypdf.exec'],
+    packages=find_packages(exclude=["tests", "tests.*"]),
     keywords=['PDF', 'OCR', 'optical character recognition', 'PDF/A', 'scanning'],
     classifiers=[
         "Programming Language :: Python :: 3",
@@ -215,9 +215,6 @@ setup(
         ],
     setup_requires=[
         'setuptools_scm',
-        'cffi>=1.5.0',
-        'pytest-runner',
-        'pytest-helpers-namespace'
     ],
     use_scm_version={'version_scheme': 'post-release'},
     cffi_modules=[
@@ -225,11 +222,11 @@ setup(
     ],
     install_requires=[
         'ruffus==2.6.3',        # pinned - ocrmypdf implements a 2.6.3 workaround
-        'Pillow>=3.1.1',        # Pillow is pretty stable
+        'Pillow>=4.0.0',        # Pillow < 4 has BytesIO/TIFF bug w/img2pdf 0.2.3
         'reportlab>=3.2.0',     # oldest released version with sane image handling
         'PyPDF2>=1.26',         # pure Python, so track HEAD closely
-        'img2pdf>=0.2.1',       # pure Python, so track HEAD closely
-        'cffi>=1.5.0'           # oldest version ever tested
+        'img2pdf>=0.2.3',       # pure Python, so track HEAD closely
+        'cffi>=1.9.1'
     ],
     tests_require=tests_require,
     entry_points={
diff --git a/test_requirements.txt b/test_requirements.txt
index c2fab9d3..3e9f413a 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -1,2 +1,2 @@
-pytest >= 2.8
+pytest >= 3.0
 pytest-helpers-namespace
\ No newline at end of file