28 files changed, 6 insertions, 6 deletions
diff --git a/numpy/tests/setup.py b/numpy/tests/setup.py
index 03900a82b..f034cdf95 100644
--- a/numpy/tests/setup.py
+++ b/numpy/tests/setup.py
@@ -1,10 +1,7 @@
 def configuration(parent_package='', top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('tests', parent_package, top_path)
-    config.add_data_dir('pass')
-    config.add_data_dir('fail')
-    config.add_data_dir('reveal')
-    config.add_data_files('mypy.ini')
+    config.add_data_dir('typing')
     return config
 
 
diff --git a/numpy/tests/test_typing.py b/numpy/tests/test_typing.py
index 757ea0b52..3fb1ce243 100644
--- a/numpy/tests/test_typing.py
+++ b/numpy/tests/test_typing.py
@@ -12,7 +12,10 @@ except ImportError:
 else:
     NO_MYPY = False
 
-TESTS_DIR = os.path.dirname(os.path.abspath(__file__))
+TESTS_DIR = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)),
+    "typing",
+)
 PASS_DIR = os.path.join(TESTS_DIR, "pass")
 FAIL_DIR = os.path.join(TESTS_DIR, "fail")
 REVEAL_DIR = os.path.join(TESTS_DIR, "reveal")
diff --git a/numpy/tests/fail/array_like.py b/numpy/tests/typing/fail/array_like.py
index a5ef5795f..a5ef5795f 100644
--- a/numpy/tests/fail/array_like.py
+++ b/numpy/tests/typing/fail/array_like.py
diff --git a/numpy/tests/fail/fromnumeric.py b/numpy/tests/typing/fail/fromnumeric.py
index f158a1071..f158a1071 100644
--- a/numpy/tests/fail/fromnumeric.py
+++ b/numpy/tests/typing/fail/fromnumeric.py
diff --git a/numpy/tests/fail/ndarray.py b/numpy/tests/typing/fail/ndarray.py
index 5a5130d40..5a5130d40 100644
--- a/numpy/tests/fail/ndarray.py
+++ b/numpy/tests/typing/fail/ndarray.py
diff --git a/numpy/tests/fail/numerictypes.py b/numpy/tests/typing/fail/numerictypes.py
index dd03eacc1..dd03eacc1 100644
--- a/numpy/tests/fail/numerictypes.py
+++ b/numpy/tests/typing/fail/numerictypes.py
diff --git a/numpy/tests/fail/scalars.py b/numpy/tests/typing/fail/scalars.py
index 0dfc55124..0dfc55124 100644
--- a/numpy/tests/fail/scalars.py
+++ b/numpy/tests/typing/fail/scalars.py
diff --git a/numpy/tests/fail/simple.py b/numpy/tests/typing/fail/simple.py
index b5e9d1b13..b5e9d1b13 100644
--- a/numpy/tests/fail/simple.py
+++ b/numpy/tests/typing/fail/simple.py
diff --git a/numpy/tests/fail/ufuncs.py b/numpy/tests/typing/fail/ufuncs.py
index b178a4ea4..b178a4ea4 100644
--- a/numpy/tests/fail/ufuncs.py
+++ b/numpy/tests/typing/fail/ufuncs.py
diff --git a/numpy/tests/fail/warnings_and_errors.py b/numpy/tests/typing/fail/warnings_and_errors.py
index 7390cc45f..7390cc45f 100644
--- a/numpy/tests/fail/warnings_and_errors.py
+++ b/numpy/tests/typing/fail/warnings_and_errors.py
diff --git a/numpy/tests/mypy.ini b/numpy/tests/typing/mypy.ini
index cad431a03..91d93588a 100644
--- a/numpy/tests/mypy.ini
+++ b/numpy/tests/typing/mypy.ini
@@ -1,5 +1,5 @@
 [mypy]
-mypy_path = ../..
+mypy_path = ../../..
 
 [mypy-numpy]
 ignore_errors = True
diff --git a/numpy/tests/pass/array_like.py b/numpy/tests/typing/pass/array_like.py
index 098149c4b..098149c4b 100644
--- a/numpy/tests/pass/array_like.py
+++ b/numpy/tests/typing/pass/array_like.py
diff --git a/numpy/tests/pass/fromnumeric.py b/numpy/tests/typing/pass/fromnumeric.py
index 0ce8ef970..0ce8ef970 100644
--- a/numpy/tests/pass/fromnumeric.py
+++ b/numpy/tests/typing/pass/fromnumeric.py
diff --git a/numpy/tests/pass/ndarray_conversion.py b/numpy/tests/typing/pass/ndarray_conversion.py
index 303cf53e4..303cf53e4 100644
--- a/numpy/tests/pass/ndarray_conversion.py
+++ b/numpy/tests/typing/pass/ndarray_conversion.py
diff --git a/numpy/tests/pass/ndarray_shape_manipulation.py b/numpy/tests/typing/pass/ndarray_shape_manipulation.py
index 0ca3dff39..0ca3dff39 100644
--- a/numpy/tests/pass/ndarray_shape_manipulation.py
+++ b/numpy/tests/typing/pass/ndarray_shape_manipulation.py
diff --git a/numpy/tests/pass/numerictypes.py b/numpy/tests/typing/pass/numerictypes.py
index 4f205cabc..4f205cabc 100644
--- a/numpy/tests/pass/numerictypes.py
+++ b/numpy/tests/typing/pass/numerictypes.py
diff --git a/numpy/tests/pass/scalars.py b/numpy/tests/typing/pass/scalars.py
index bd055673b..bd055673b 100644
--- a/numpy/tests/pass/scalars.py
+++ b/numpy/tests/typing/pass/scalars.py
diff --git a/numpy/tests/pass/simple.py b/numpy/tests/typing/pass/simple.py
index b9715da5d..b9715da5d 100644
--- a/numpy/tests/pass/simple.py
+++ b/numpy/tests/typing/pass/simple.py
diff --git a/numpy/tests/pass/simple_py3.py b/numpy/tests/typing/pass/simple_py3.py
index c05a1ce61..c05a1ce61 100644
--- a/numpy/tests/pass/simple_py3.py
+++ b/numpy/tests/typing/pass/simple_py3.py
diff --git a/numpy/tests/pass/ufuncs.py b/numpy/tests/typing/pass/ufuncs.py
index c81ac48d1..c81ac48d1 100644
--- a/numpy/tests/pass/ufuncs.py
+++ b/numpy/tests/typing/pass/ufuncs.py
diff --git a/numpy/tests/pass/warnings_and_errors.py b/numpy/tests/typing/pass/warnings_and_errors.py
index 5b6ec2626..5b6ec2626 100644
--- a/numpy/tests/pass/warnings_and_errors.py
+++ b/numpy/tests/typing/pass/warnings_and_errors.py
diff --git a/numpy/tests/reveal/constants.py b/numpy/tests/typing/reveal/constants.py
index 8e00810bd..8e00810bd 100644
--- a/numpy/tests/reveal/constants.py
+++ b/numpy/tests/typing/reveal/constants.py
diff --git a/numpy/tests/reveal/fromnumeric.py b/numpy/tests/typing/reveal/fromnumeric.py
index 7d79d5fa9..7d79d5fa9 100644
--- a/numpy/tests/reveal/fromnumeric.py
+++ b/numpy/tests/typing/reveal/fromnumeric.py
diff --git a/numpy/tests/reveal/ndarray_conversion.py b/numpy/tests/typing/reveal/ndarray_conversion.py
index 411adcf63..411adcf63 100644
--- a/numpy/tests/reveal/ndarray_conversion.py
+++ b/numpy/tests/typing/reveal/ndarray_conversion.py
diff --git a/numpy/tests/reveal/ndarray_shape_manipulation.py b/numpy/tests/typing/reveal/ndarray_shape_manipulation.py
index a44e1cfa1..a44e1cfa1 100644
--- a/numpy/tests/reveal/ndarray_shape_manipulation.py
+++ b/numpy/tests/typing/reveal/ndarray_shape_manipulation.py
diff --git a/numpy/tests/reveal/numerictypes.py b/numpy/tests/typing/reveal/numerictypes.py
index e026158cd..e026158cd 100644
--- a/numpy/tests/reveal/numerictypes.py
+++ b/numpy/tests/typing/reveal/numerictypes.py
diff --git a/numpy/tests/reveal/scalars.py b/numpy/tests/typing/reveal/scalars.py
index 8a9555fc3..8a9555fc3 100644
--- a/numpy/tests/reveal/scalars.py
+++ b/numpy/tests/typing/reveal/scalars.py
diff --git a/numpy/tests/reveal/warnings_and_errors.py b/numpy/tests/typing/reveal/warnings_and_errors.py
index c428deb7a..c428deb7a 100644
--- a/numpy/tests/reveal/warnings_and_errors.py
+++ b/numpy/tests/typing/reveal/warnings_and_errors.py