14 files changed, 17 insertions, 14 deletions
diff --git a/doc/TESTS.rst.txt b/doc/TESTS.rst.txt
index 007840b39..af47fe99c 100644
--- a/doc/TESTS.rst.txt
+++ b/doc/TESTS.rst.txt
@@ -256,7 +256,7 @@ section of your setup.py::
   ...
   def configuration(parent_package='', top_path=None):
       ...
-      config.add_data_dir('tests')
+      config.add_subpackage('tests')
       return config
   ...
 
diff --git a/numpy/compat/setup.py b/numpy/compat/setup.py
index afa511673..c1b34a2cc 100644
--- a/numpy/compat/setup.py
+++ b/numpy/compat/setup.py
@@ -2,7 +2,7 @@ def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
 
     config = Configuration('compat', parent_package, top_path)
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
     return config
 
 if __name__ == '__main__':
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 15e732614..76f3f5abe 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -961,7 +961,7 @@ def configuration(parent_package='',top_path=None):
     config.add_extension('_operand_flag_tests',
                     sources=[join('src', 'umath', '_operand_flag_tests.c.src')])
 
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
     config.add_data_dir('tests/data')
 
     config.make_svn_version_py()
diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py
index 69d35f5c2..88cd1a160 100644
--- a/numpy/distutils/setup.py
+++ b/numpy/distutils/setup.py
@@ -4,7 +4,7 @@ def configuration(parent_package='',top_path=None):
     config = Configuration('distutils', parent_package, top_path)
     config.add_subpackage('command')
     config.add_subpackage('fcompiler')
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
     config.add_data_files('site.cfg')
     config.add_data_files('mingw/gfortran_vs2003_hack.c')
     config.make_config_py()
diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py
index 6314c5af3..80b47e527 100644
--- a/numpy/f2py/setup.py
+++ b/numpy/f2py/setup.py
@@ -25,7 +25,8 @@ from __version__ import version
 
 def configuration(parent_package='', top_path=None):
     config = Configuration('f2py', parent_package, top_path)
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
+    config.add_data_dir('tests/src')
     config.add_data_files(
         'src/fortranobject.c',
         'src/fortranobject.h')
diff --git a/numpy/fft/setup.py b/numpy/fft/setup.py
index e8204fcd3..9ed824e4f 100644
--- a/numpy/fft/setup.py
+++ b/numpy/fft/setup.py
@@ -4,7 +4,7 @@ def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('fft', parent_package, top_path)
 
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
 
     # AIX needs to be told to use large file support - at all times
     defs = [('_LARGE_FILES', None)] if sys.platform[:3] == "aix" else []
diff --git a/numpy/lib/setup.py b/numpy/lib/setup.py
index 5d0341d86..b3f441f38 100644
--- a/numpy/lib/setup.py
+++ b/numpy/lib/setup.py
@@ -2,7 +2,8 @@ def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
 
     config = Configuration('lib', parent_package, top_path)
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
+    config.add_data_dir('tests/data')
     return config
 
 if __name__ == '__main__':
diff --git a/numpy/linalg/setup.py b/numpy/linalg/setup.py
index acfab0a68..57fdd502b 100644
--- a/numpy/linalg/setup.py
+++ b/numpy/linalg/setup.py
@@ -6,7 +6,7 @@ def configuration(parent_package='', top_path=None):
     from numpy.distutils.system_info import get_info, system_info
     config = Configuration('linalg', parent_package, top_path)
 
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
 
     # Configure lapack_lite
 
diff --git a/numpy/ma/setup.py b/numpy/ma/setup.py
index 144a961c2..d3f34c874 100644
--- a/numpy/ma/setup.py
+++ b/numpy/ma/setup.py
@@ -2,7 +2,7 @@
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('ma', parent_package, top_path)
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
     return config
 
 if __name__ == "__main__":
diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py
index 529d2a2eb..19b3bb2de 100644
--- a/numpy/matrixlib/setup.py
+++ b/numpy/matrixlib/setup.py
@@ -2,7 +2,7 @@
 def configuration(parent_package='', top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('matrixlib', parent_package, top_path)
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
     return config
 
 if __name__ == "__main__":
diff --git a/numpy/polynomial/setup.py b/numpy/polynomial/setup.py
index 8fc82cba1..641464518 100644
--- a/numpy/polynomial/setup.py
+++ b/numpy/polynomial/setup.py
@@ -1,7 +1,7 @@
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('polynomial', parent_package, top_path)
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
     return config
 
 if __name__ == '__main__':
diff --git a/numpy/random/setup.py b/numpy/random/setup.py
index 90ec42671..88ddb1268 100644
--- a/numpy/random/setup.py
+++ b/numpy/random/setup.py
@@ -31,7 +31,8 @@ def configuration(parent_package='', top_path=None):
                 ('_LARGEFILE64_SOURCE', '1')]
 
     defs.append(('NPY_NO_DEPRECATED_API', 0))
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
+    config.add_data_dir('tests/data')
     config.add_data_dir('_examples')
 
     EXTRA_LINK_ARGS = []
diff --git a/numpy/setup.py b/numpy/setup.py
index fb9b36b78..52db6a68b 100644
--- a/numpy/setup.py
+++ b/numpy/setup.py
@@ -18,7 +18,7 @@ def configuration(parent_package='',top_path=None):
     config.add_subpackage('random')
     config.add_subpackage('testing')
     config.add_data_dir('doc')
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
     config.make_config_py() # installs __config__.py
     return config
 
diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py
index f4970991c..13191f13f 100755
--- a/numpy/testing/setup.py
+++ b/numpy/testing/setup.py
@@ -5,7 +5,7 @@ def configuration(parent_package='',top_path=None):
     config = Configuration('testing', parent_package, top_path)
 
     config.add_subpackage('_private')
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
     return config
 
 if __name__ == '__main__':