diff --git a/scikits/image/setup.py b/scikits/image/setup.py
new file mode 100644
index 00000000..714b30cb
--- /dev/null
+++ b/scikits/image/setup.py
@@ -0,0 +1,31 @@
+import os
+
+def configuration(parent_package='', top_path=None):
+    from numpy.distutils.misc_util import Configuration
+
+    config = Configuration('image', parent_package, top_path)
+
+    config.add_subpackage('opencv')
+
+    def add_test_directories(arg, dirname, fnames):
+        if dirname.split(os.path.sep)[-1] == 'tests':
+            config.add_data_dir(dirname)
+            print "Added", dirname
+
+    # Add test directories
+    from os.path import isdir, dirname, join, abspath
+    rel_isdir = lambda d: isdir(join(curpath, d))
+
+    curpath = join(dirname(__file__), './')
+    subdirs = [join(d, 'tests') for d in os.listdir(curpath) if rel_isdir(d)]
+    subdirs = [d for d in subdirs if rel_isdir(d)]
+    for test_dir in subdirs:
+        config.add_data_dir(test_dir)
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+
+    config = Configuration(top_path='').todict()
+    setup(**config)
+