diff --git a/setup.py b/setup.py
index b4379c2..ace8f9c 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,22 @@ kwargs = {'name': 'Glymur',
           'package_data': {'glymur': ['data/*.jp2', 'data/*.j2k']},
           'scripts': ['bin/jp2dump'],
           'license': 'LICENSE.txt',
+          'test_suite': 'glymur.test',
           'platforms': ['darwin']}
 
 instllrqrs = ['numpy>1.6.2']
 if sys.hexversion < 0x03030000:
     instllrqrs.append('contextlib2>=0.4')
-    instllrqrs.append('mock>=1.0.1')
 if sys.hexversion < 0x02070000:
     instllrqrs.append('ordereddict>=1.1')
     instllrqrs.append('unittest2>=0.5.1')
 kwargs['install_requires'] = instllrqrs
 
+testrqrs = ['matplotlib>=1.1.0', 'Pillow>=2.0.0']
+if sys.hexversion < 0x03030000:
+    testrqrs.append('mock>=1.0.1')
+kwargs['tests_require'] = testrqrs
+
 clssfrs = ["Programming Language :: Python",
            "Programming Language :: Python :: 2.6",
            "Programming Language :: Python :: 2.7",