diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b2a848897d812547adb0c8a97c735a880fbb7140..2b2131c1e7b2ca681667ce46bf483e8120a46d95 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -29,6 +29,14 @@ Changed
 * Internal reorganisation in the :mod:`.idle` module.
 
 
+Fixed
+^^^^^
+
+
+* Fixed incorrect usage of ``setuptools.find_packages``, which was causing
+  unit tests to be installed.
+
+
 Deprecated
 ^^^^^^^^^^
 
diff --git a/setup.py b/setup.py
index 6b5ca7dd9d824851b44e1b4db37a91bb48abbf54..ea4b43f21f2978da1b4216d3bc4bffe3c8faa790 100644
--- a/setup.py
+++ b/setup.py
@@ -27,8 +27,7 @@ with open(op.join(basedir, 'requirements.txt'), 'rt') as f:
 with open(op.join(basedir, 'requirements-extra.txt'), 'rt') as f:
     extra_requires = {'extras' : [l.strip() for l in f.readlines()]}
 
-packages = find_packages(
-    exclude=('doc', 'tests', 'dist', 'build', 'fslpy.egg-info'))
+packages = find_packages(include=('fsl', 'fsl.*'))
 
 # Figure out the current fslpy version, as defined in fsl/version.py. We
 # don't want to import the fsl package,  as this may cause build problems.