diff --git a/conftest.py b/nipype/conftest.py
similarity index 77%
rename from conftest.py
rename to nipype/conftest.py
index f2d52f5f85..27a3789ea4 100644
--- a/conftest.py
+++ b/nipype/conftest.py
@@ -8,5 +8,5 @@ def add_np(doctest_namespace):
 
 
     filepath = os.path.dirname(os.path.realpath(__file__))
-    datadir = os.path.realpath(os.path.join(filepath, 'nipype/testing/data'))
+    datadir = os.path.realpath(os.path.join(filepath, 'testing/data'))
     doctest_namespace["datadir"] = datadir
diff --git a/pytest.ini b/nipype/pytest.ini
similarity index 100%
rename from pytest.ini
rename to nipype/pytest.ini
diff --git a/setup.py b/setup.py
index 331fa5905b..8bca901a4a 100755
--- a/setup.py
+++ b/setup.py
@@ -100,15 +100,17 @@ def main():
         pjoin('testing', 'data', 'dicomdir', '*'),
         pjoin('testing', 'data', 'bedpostxout', '*'),
         pjoin('testing', 'data', 'tbss_dir', '*'),
-        pjoin('testing', 'data', 'brukerdir', '*'),
-        pjoin('testing', 'data', 'brukerdir', 'pdata', '*'),
+        pjoin('testing', 'data', 'brukerdir', 'fid'),
         pjoin('testing', 'data', 'brukerdir', 'pdata', '1', '*'),
+        pjoin('testing', 'data', 'ds005', '*'),
         pjoin('workflows', 'data', '*'),
         pjoin('pipeline', 'engine', 'report_template.html'),
         pjoin('external', 'd3.js'),
         pjoin('interfaces', 'script_templates', '*'),
         pjoin('interfaces', 'tests', 'realign_json.json'),
         pjoin('interfaces', 'tests', 'use_resources'),
+        'pytest.ini',
+        'conftest.py',
     ]
 
     # Python 3: use a locals dictionary