106 files changed, 18 insertions, 54 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index e9b70088..6b779861 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,8 +2,8 @@ include ChangeLog
 include README
 include COPYING
 include COPYING.LESSER
-recursive-include test/data *.py *.zip *.egg
-recursive-include test/data_py3 *.py *.zip *.egg
-recursive-include test/data2 *.py
-recursive-include test/regrtest_data *.py
-recursive-include brain/ *.py
+recursive-include astroid/tests/data *.py *.zip *.egg
+recursive-include astroid/tests/data_py3 *.py *.zip *.egg
+recursive-include astroid/tests/data2 *.py
+recursive-include astroid/tests/regrtest_data *.py
+recursive-include astroid/brain *.py
diff --git a/__init__.py b/astroid/__init__.py
index 6df06b1e..6df06b1e 100644
--- a/__init__.py
+++ b/astroid/__init__.py
diff --git a/__pkginfo__.py b/astroid/__pkginfo__.py
index a93173f7..a93173f7 100644
--- a/__pkginfo__.py
+++ b/astroid/__pkginfo__.py
diff --git a/as_string.py b/astroid/as_string.py
index f19713d9..f19713d9 100644
--- a/as_string.py
+++ b/astroid/as_string.py
diff --git a/bases.py b/astroid/bases.py
index f1f4cc4b..f1f4cc4b 100644
--- a/bases.py
+++ b/astroid/bases.py
diff --git a/brain/py2gi.py b/astroid/brain/py2gi.py
index 20356c11..20356c11 100644
--- a/brain/py2gi.py
+++ b/astroid/brain/py2gi.py
diff --git a/brain/py2mechanize.py b/astroid/brain/py2mechanize.py
index 1e0b102d..1e0b102d 100644
--- a/brain/py2mechanize.py
+++ b/astroid/brain/py2mechanize.py
diff --git a/brain/py2pytest.py b/astroid/brain/py2pytest.py
index b5537c09..b5537c09 100644
--- a/brain/py2pytest.py
+++ b/astroid/brain/py2pytest.py
diff --git a/brain/py2qt4.py b/astroid/brain/py2qt4.py
index 0ee0410e..0ee0410e 100644
--- a/brain/py2qt4.py
+++ b/astroid/brain/py2qt4.py
diff --git a/brain/py2stdlib.py b/astroid/brain/py2stdlib.py
index 74d60280..74d60280 100644
--- a/brain/py2stdlib.py
+++ b/astroid/brain/py2stdlib.py
diff --git a/builder.py b/astroid/builder.py
index 4e0e225c..4e0e225c 100644
--- a/builder.py
+++ b/astroid/builder.py
diff --git a/exceptions.py b/astroid/exceptions.py
index 3889e2e7..3889e2e7 100644
--- a/exceptions.py
+++ b/astroid/exceptions.py
diff --git a/inference.py b/astroid/inference.py
index 6cd4b787..6cd4b787 100644
--- a/inference.py
+++ b/astroid/inference.py
diff --git a/inspector.py b/astroid/inspector.py
index 1fc31926..1fc31926 100644
--- a/inspector.py
+++ b/astroid/inspector.py
diff --git a/manager.py b/astroid/manager.py
index e1660e49..e1660e49 100644
--- a/manager.py
+++ b/astroid/manager.py
diff --git a/mixins.py b/astroid/mixins.py
index dbf1673a..dbf1673a 100644
--- a/mixins.py
+++ b/astroid/mixins.py
diff --git a/modutils.py b/astroid/modutils.py
index efc999b4..efc999b4 100644
--- a/modutils.py
+++ b/astroid/modutils.py
diff --git a/node_classes.py b/astroid/node_classes.py
index 71e512f4..71e512f4 100644
--- a/node_classes.py
+++ b/astroid/node_classes.py
diff --git a/nodes.py b/astroid/nodes.py
index 263ab476..263ab476 100644
--- a/nodes.py
+++ b/astroid/nodes.py
diff --git a/protocols.py b/astroid/protocols.py
index 4dd515fd..4dd515fd 100644
--- a/protocols.py
+++ b/astroid/protocols.py
diff --git a/raw_building.py b/astroid/raw_building.py
index 08f6af6d..08f6af6d 100644
--- a/raw_building.py
+++ b/astroid/raw_building.py
diff --git a/rebuilder.py b/astroid/rebuilder.py
index e3899fd5..e3899fd5 100644
--- a/rebuilder.py
+++ b/astroid/rebuilder.py
diff --git a/scoped_nodes.py b/astroid/scoped_nodes.py
index b792bd81..b792bd81 100644
--- a/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
diff --git a/test_utils.py b/astroid/test_utils.py
index 7ae9361e..7ae9361e 100644
--- a/test_utils.py
+++ b/astroid/test_utils.py
diff --git a/test/data/MyPyPa-0.1.0-py2.5.egg b/astroid/tests/data/MyPyPa-0.1.0-py2.5.egg
index f62599c7..f62599c7 100644
--- a/test/data/MyPyPa-0.1.0-py2.5.egg
+++ b/astroid/tests/data/MyPyPa-0.1.0-py2.5.egg
diff --git a/test/data/MyPyPa-0.1.0-py2.5.zip b/astroid/tests/data/MyPyPa-0.1.0-py2.5.zip
index f62599c7..f62599c7 100644
--- a/test/data/MyPyPa-0.1.0-py2.5.zip
+++ b/astroid/tests/data/MyPyPa-0.1.0-py2.5.zip
diff --git a/test/data/SSL1/Connection1.py b/astroid/tests/data/SSL1/Connection1.py
index c0f01522..c0f01522 100644
--- a/test/data/SSL1/Connection1.py
+++ b/astroid/tests/data/SSL1/Connection1.py
diff --git a/test/data/SSL1/__init__.py b/astroid/tests/data/SSL1/__init__.py
index a007b049..a007b049 100644
--- a/test/data/SSL1/__init__.py
+++ b/astroid/tests/data/SSL1/__init__.py
diff --git a/test/data/__init__.py b/astroid/tests/data/__init__.py
index 332e2e72..332e2e72 100644
--- a/test/data/__init__.py
+++ b/astroid/tests/data/__init__.py
diff --git a/test/data/absimport.py b/astroid/tests/data/absimport.py
index f98effa6..f98effa6 100644
--- a/test/data/absimport.py
+++ b/astroid/tests/data/absimport.py
diff --git a/test/data/all.py b/astroid/tests/data/all.py
index 23f7d2b6..23f7d2b6 100644
--- a/test/data/all.py
+++ b/astroid/tests/data/all.py
diff --git a/test/data/appl/__init__.py b/astroid/tests/data/appl/__init__.py
index d652ffd9..d652ffd9 100644
--- a/test/data/appl/__init__.py
+++ b/astroid/tests/data/appl/__init__.py
diff --git a/test/data/appl/myConnection.py b/astroid/tests/data/appl/myConnection.py
index 93026a60..93026a60 100644
--- a/test/data/appl/myConnection.py
+++ b/astroid/tests/data/appl/myConnection.py
diff --git a/test/data/email.py b/astroid/tests/data/email.py
index dc593564..dc593564 100644
--- a/test/data/email.py
+++ b/astroid/tests/data/email.py
diff --git a/test/data/find_test/__init__.py b/astroid/tests/data/find_test/__init__.py
index e69de29b..e69de29b 100644
--- a/test/data/find_test/__init__.py
+++ b/astroid/tests/data/find_test/__init__.py
diff --git a/test/data/find_test/module.py b/astroid/tests/data/find_test/module.py
index e69de29b..e69de29b 100644
--- a/test/data/find_test/module.py
+++ b/astroid/tests/data/find_test/module.py
diff --git a/test/data/find_test/module2.py b/astroid/tests/data/find_test/module2.py
index e69de29b..e69de29b 100644
--- a/test/data/find_test/module2.py
+++ b/astroid/tests/data/find_test/module2.py
diff --git a/test/data/find_test/noendingnewline.py b/astroid/tests/data/find_test/noendingnewline.py
index e69de29b..e69de29b 100644
--- a/test/data/find_test/noendingnewline.py
+++ b/astroid/tests/data/find_test/noendingnewline.py
diff --git a/test/data/find_test/nonregr.py b/astroid/tests/data/find_test/nonregr.py
index e69de29b..e69de29b 100644
--- a/test/data/find_test/nonregr.py
+++ b/astroid/tests/data/find_test/nonregr.py
diff --git a/test/data/format.py b/astroid/tests/data/format.py
index 73797061..73797061 100644
--- a/test/data/format.py
+++ b/astroid/tests/data/format.py
diff --git a/test/data/lmfp/__init__.py b/astroid/tests/data/lmfp/__init__.py
index 74b26b82..74b26b82 100644
--- a/test/data/lmfp/__init__.py
+++ b/astroid/tests/data/lmfp/__init__.py
diff --git a/test/data/lmfp/foo.py b/astroid/tests/data/lmfp/foo.py
index 8f7de1e8..8f7de1e8 100644
--- a/test/data/lmfp/foo.py
+++ b/astroid/tests/data/lmfp/foo.py
diff --git a/test/data/module.py b/astroid/tests/data/module.py
index fb48dc1d..fb48dc1d 100644
--- a/test/data/module.py
+++ b/astroid/tests/data/module.py
diff --git a/test/data/module1abs/__init__.py b/astroid/tests/data/module1abs/__init__.py
index 9eb5902a..9eb5902a 100644
--- a/test/data/module1abs/__init__.py
+++ b/astroid/tests/data/module1abs/__init__.py
diff --git a/test/data/module1abs/core.py b/astroid/tests/data/module1abs/core.py
index de101117..de101117 100644
--- a/test/data/module1abs/core.py
+++ b/astroid/tests/data/module1abs/core.py
diff --git a/test/data/module2.py b/astroid/tests/data/module2.py
index d6bf49eb..d6bf49eb 100644
--- a/test/data/module2.py
+++ b/astroid/tests/data/module2.py
diff --git a/test/data/noendingnewline.py b/astroid/tests/data/noendingnewline.py
index e1d6e4a1..e1d6e4a1 100644
--- a/test/data/noendingnewline.py
+++ b/astroid/tests/data/noendingnewline.py
diff --git a/test/data/nonregr.py b/astroid/tests/data/nonregr.py
index a670e39f..a670e39f 100644
--- a/test/data/nonregr.py
+++ b/astroid/tests/data/nonregr.py
diff --git a/test/data/notall.py b/astroid/tests/data/notall.py
index b998d882..b998d882 100644
--- a/test/data/notall.py
+++ b/astroid/tests/data/notall.py
diff --git a/test/data2/__init__.py b/astroid/tests/data2/__init__.py
index e69de29b..e69de29b 100644
--- a/test/data2/__init__.py
+++ b/astroid/tests/data2/__init__.py
diff --git a/test/data2/clientmodule_test.py b/astroid/tests/data2/clientmodule_test.py
index 196fff83..196fff83 100644
--- a/test/data2/clientmodule_test.py
+++ b/astroid/tests/data2/clientmodule_test.py
diff --git a/test/data2/suppliermodule_test.py b/astroid/tests/data2/suppliermodule_test.py
index ddacb477..ddacb477 100644
--- a/test/data2/suppliermodule_test.py
+++ b/astroid/tests/data2/suppliermodule_test.py
diff --git a/test/data_py3/MyPyPa-0.1.0-py2.5.egg b/astroid/tests/data_py3/MyPyPa-0.1.0-py2.5.egg
index f62599c7..f62599c7 100644
--- a/test/data_py3/MyPyPa-0.1.0-py2.5.egg
+++ b/astroid/tests/data_py3/MyPyPa-0.1.0-py2.5.egg
diff --git a/test/data_py3/MyPyPa-0.1.0-py2.5.zip b/astroid/tests/data_py3/MyPyPa-0.1.0-py2.5.zip
index f62599c7..f62599c7 100644
--- a/test/data_py3/MyPyPa-0.1.0-py2.5.zip
+++ b/astroid/tests/data_py3/MyPyPa-0.1.0-py2.5.zip
diff --git a/test/data_py3/SSL1/Connection1.py b/astroid/tests/data_py3/SSL1/Connection1.py
index 7373271d..7373271d 100644
--- a/test/data_py3/SSL1/Connection1.py
+++ b/astroid/tests/data_py3/SSL1/Connection1.py
diff --git a/test/data_py3/SSL1/__init__.py b/astroid/tests/data_py3/SSL1/__init__.py
index c83ededc..c83ededc 100644
--- a/test/data_py3/SSL1/__init__.py
+++ b/astroid/tests/data_py3/SSL1/__init__.py
diff --git a/test/data_py3/__init__.py b/astroid/tests/data_py3/__init__.py
index 332e2e72..332e2e72 100644
--- a/test/data_py3/__init__.py
+++ b/astroid/tests/data_py3/__init__.py
diff --git a/test/data_py3/absimport.py b/astroid/tests/data_py3/absimport.py
index 88f9d955..88f9d955 100644
--- a/test/data_py3/absimport.py
+++ b/astroid/tests/data_py3/absimport.py
diff --git a/test/data_py3/all.py b/astroid/tests/data_py3/all.py
index 587765b5..587765b5 100644
--- a/test/data_py3/all.py
+++ b/astroid/tests/data_py3/all.py
diff --git a/test/data_py3/appl/__init__.py b/astroid/tests/data_py3/appl/__init__.py
index d652ffd9..d652ffd9 100644
--- a/test/data_py3/appl/__init__.py
+++ b/astroid/tests/data_py3/appl/__init__.py
diff --git a/test/data_py3/appl/myConnection.py b/astroid/tests/data_py3/appl/myConnection.py
index b5b206a0..b5b206a0 100644
--- a/test/data_py3/appl/myConnection.py
+++ b/astroid/tests/data_py3/appl/myConnection.py
diff --git a/test/data_py3/email.py b/astroid/tests/data_py3/email.py
index dc593564..dc593564 100644
--- a/test/data_py3/email.py
+++ b/astroid/tests/data_py3/email.py
diff --git a/test/data_py3/find_test/__init__.py b/astroid/tests/data_py3/find_test/__init__.py
index e69de29b..e69de29b 100644
--- a/test/data_py3/find_test/__init__.py
+++ b/astroid/tests/data_py3/find_test/__init__.py
diff --git a/test/data_py3/find_test/module.py b/astroid/tests/data_py3/find_test/module.py
index e69de29b..e69de29b 100644
--- a/test/data_py3/find_test/module.py
+++ b/astroid/tests/data_py3/find_test/module.py
diff --git a/test/data_py3/find_test/module2.py b/astroid/tests/data_py3/find_test/module2.py
index e69de29b..e69de29b 100644
--- a/test/data_py3/find_test/module2.py
+++ b/astroid/tests/data_py3/find_test/module2.py
diff --git a/test/data_py3/find_test/noendingnewline.py b/astroid/tests/data_py3/find_test/noendingnewline.py
index e69de29b..e69de29b 100644
--- a/test/data_py3/find_test/noendingnewline.py
+++ b/astroid/tests/data_py3/find_test/noendingnewline.py
diff --git a/test/data_py3/find_test/nonregr.py b/astroid/tests/data_py3/find_test/nonregr.py
index e69de29b..e69de29b 100644
--- a/test/data_py3/find_test/nonregr.py
+++ b/astroid/tests/data_py3/find_test/nonregr.py
diff --git a/test/data_py3/format.py b/astroid/tests/data_py3/format.py
index 73797061..73797061 100644
--- a/test/data_py3/format.py
+++ b/astroid/tests/data_py3/format.py
diff --git a/test/data_py3/lmfp/__init__.py b/astroid/tests/data_py3/lmfp/__init__.py
index 74b26b82..74b26b82 100644
--- a/test/data_py3/lmfp/__init__.py
+++ b/astroid/tests/data_py3/lmfp/__init__.py
diff --git a/test/data_py3/lmfp/foo.py b/astroid/tests/data_py3/lmfp/foo.py
index 8f7de1e8..8f7de1e8 100644
--- a/test/data_py3/lmfp/foo.py
+++ b/astroid/tests/data_py3/lmfp/foo.py
diff --git a/test/data_py3/module.py b/astroid/tests/data_py3/module.py
index ec5b64aa..ec5b64aa 100644
--- a/test/data_py3/module.py
+++ b/astroid/tests/data_py3/module.py
diff --git a/test/data_py3/module1abs/__init__.py b/astroid/tests/data_py3/module1abs/__init__.py
index f9d5b686..f9d5b686 100644
--- a/test/data_py3/module1abs/__init__.py
+++ b/astroid/tests/data_py3/module1abs/__init__.py
diff --git a/test/data_py3/module1abs/core.py b/astroid/tests/data_py3/module1abs/core.py
index de101117..de101117 100644
--- a/test/data_py3/module1abs/core.py
+++ b/astroid/tests/data_py3/module1abs/core.py
diff --git a/test/data_py3/module2.py b/astroid/tests/data_py3/module2.py
index 94a8bc79..94a8bc79 100644
--- a/test/data_py3/module2.py
+++ b/astroid/tests/data_py3/module2.py
diff --git a/test/data_py3/noendingnewline.py b/astroid/tests/data_py3/noendingnewline.py
index e17b92cc..e17b92cc 100644
--- a/test/data_py3/noendingnewline.py
+++ b/astroid/tests/data_py3/noendingnewline.py
diff --git a/test/data_py3/nonregr.py b/astroid/tests/data_py3/nonregr.py
index 78765c85..78765c85 100644
--- a/test/data_py3/nonregr.py
+++ b/astroid/tests/data_py3/nonregr.py
diff --git a/test/data_py3/notall.py b/astroid/tests/data_py3/notall.py
index 9d35aa3a..9d35aa3a 100644
--- a/test/data_py3/notall.py
+++ b/astroid/tests/data_py3/notall.py
diff --git a/test/regrtest_data/absimp/__init__.py b/astroid/tests/regrtest_data/absimp/__init__.py
index b98444df..b98444df 100644
--- a/test/regrtest_data/absimp/__init__.py
+++ b/astroid/tests/regrtest_data/absimp/__init__.py
diff --git a/test/regrtest_data/absimp/sidepackage/__init__.py b/astroid/tests/regrtest_data/absimp/sidepackage/__init__.py
index 239499a6..239499a6 100644
--- a/test/regrtest_data/absimp/sidepackage/__init__.py
+++ b/astroid/tests/regrtest_data/absimp/sidepackage/__init__.py
diff --git a/test/regrtest_data/absimp/string.py b/astroid/tests/regrtest_data/absimp/string.py
index e68e7496..e68e7496 100644
--- a/test/regrtest_data/absimp/string.py
+++ b/astroid/tests/regrtest_data/absimp/string.py
diff --git a/test/regrtest_data/descriptor_crash.py b/astroid/tests/regrtest_data/descriptor_crash.py
index 11fbb4a2..11fbb4a2 100644
--- a/test/regrtest_data/descriptor_crash.py
+++ b/astroid/tests/regrtest_data/descriptor_crash.py
diff --git a/test/regrtest_data/package/__init__.py b/astroid/tests/regrtest_data/package/__init__.py
index 575d18b1..575d18b1 100644
--- a/test/regrtest_data/package/__init__.py
+++ b/astroid/tests/regrtest_data/package/__init__.py
diff --git a/test/regrtest_data/package/absimport.py b/astroid/tests/regrtest_data/package/absimport.py
index 33ed117c..33ed117c 100644
--- a/test/regrtest_data/package/absimport.py
+++ b/astroid/tests/regrtest_data/package/absimport.py
diff --git a/test/regrtest_data/package/hello.py b/astroid/tests/regrtest_data/package/hello.py
index b154c844..b154c844 100644
--- a/test/regrtest_data/package/hello.py
+++ b/astroid/tests/regrtest_data/package/hello.py
diff --git a/test/regrtest_data/package/import_package_subpackage_module.py b/astroid/tests/regrtest_data/package/import_package_subpackage_module.py
index ad442c16..ad442c16 100644
--- a/test/regrtest_data/package/import_package_subpackage_module.py
+++ b/astroid/tests/regrtest_data/package/import_package_subpackage_module.py
diff --git a/test/regrtest_data/package/subpackage/__init__.py b/astroid/tests/regrtest_data/package/subpackage/__init__.py
index dc4782e6..dc4782e6 100644
--- a/test/regrtest_data/package/subpackage/__init__.py
+++ b/astroid/tests/regrtest_data/package/subpackage/__init__.py
diff --git a/test/regrtest_data/package/subpackage/module.py b/astroid/tests/regrtest_data/package/subpackage/module.py
index 4b7244ba..4b7244ba 100644
--- a/test/regrtest_data/package/subpackage/module.py
+++ b/astroid/tests/regrtest_data/package/subpackage/module.py
diff --git a/test/regrtest_data/recursion.py b/astroid/tests/regrtest_data/recursion.py
index a34dad32..a34dad32 100644
--- a/test/regrtest_data/recursion.py
+++ b/astroid/tests/regrtest_data/recursion.py
diff --git a/test/regrtest_data/unicode_package/__init__.py b/astroid/tests/regrtest_data/unicode_package/__init__.py
index 713e5591..713e5591 100644
--- a/test/regrtest_data/unicode_package/__init__.py
+++ b/astroid/tests/regrtest_data/unicode_package/__init__.py
diff --git a/test/regrtest_data/unicode_package/core/__init__.py b/astroid/tests/regrtest_data/unicode_package/core/__init__.py
index e69de29b..e69de29b 100644
--- a/test/regrtest_data/unicode_package/core/__init__.py
+++ b/astroid/tests/regrtest_data/unicode_package/core/__init__.py
diff --git a/test/unittest_brain.py b/astroid/tests/unittest_brain.py
index 8fa853c3..8fa853c3 100644
--- a/test/unittest_brain.py
+++ b/astroid/tests/unittest_brain.py
diff --git a/test/unittest_builder.py b/astroid/tests/unittest_builder.py
index 47ae158f..47ae158f 100644
--- a/test/unittest_builder.py
+++ b/astroid/tests/unittest_builder.py
diff --git a/test/unittest_inference.py b/astroid/tests/unittest_inference.py
index 9b7b4725..9b7b4725 100644
--- a/test/unittest_inference.py
+++ b/astroid/tests/unittest_inference.py
diff --git a/test/unittest_inspector.py b/astroid/tests/unittest_inspector.py
index 5d5eaa2d..5d5eaa2d 100644
--- a/test/unittest_inspector.py
+++ b/astroid/tests/unittest_inspector.py
diff --git a/test/unittest_lookup.py b/astroid/tests/unittest_lookup.py
index 2ca818a8..2ca818a8 100644
--- a/test/unittest_lookup.py
+++ b/astroid/tests/unittest_lookup.py
diff --git a/test/unittest_manager.py b/astroid/tests/unittest_manager.py
index 4e0abcdf..4e0abcdf 100644
--- a/test/unittest_manager.py
+++ b/astroid/tests/unittest_manager.py
diff --git a/test/unittest_modutils.py b/astroid/tests/unittest_modutils.py
index 98955c55..83b9e890 100644
--- a/test/unittest_modutils.py
+++ b/astroid/tests/unittest_modutils.py
@@ -46,12 +46,12 @@ class ModuleFileTC(unittest.TestCase):
     def test_find_zipped_module(self):
         mtype, mfile = modutils._module_file([self.package], [path.join(DATADIR, 'MyPyPa-0.1.0-py2.5.zip')])
         self.assertEqual(mtype, modutils.ZIPFILE)
-        self.assertEqual(mfile.split(sep)[-4:], ["test", "data", "MyPyPa-0.1.0-py2.5.zip", self.package])
+        self.assertEqual(mfile.split(sep)[-4:], ["tests", "data", "MyPyPa-0.1.0-py2.5.zip", self.package])
 
     def test_find_egg_module(self):
         mtype, mfile = modutils._module_file([self.package], [path.join(DATADIR, 'MyPyPa-0.1.0-py2.5.egg')])
         self.assertEqual(mtype, modutils.ZIPFILE)
-        self.assertEqual(mfile.split(sep)[-4:], ["test", "data", "MyPyPa-0.1.0-py2.5.egg", self.package])
+        self.assertEqual(mfile.split(sep)[-4:], ["tests", "data", "MyPyPa-0.1.0-py2.5.egg", self.package])
 
 
 class load_module_from_name_tc(unittest.TestCase):
diff --git a/test/unittest_nodes.py b/astroid/tests/unittest_nodes.py
index e9c688cc..e9c688cc 100644
--- a/test/unittest_nodes.py
+++ b/astroid/tests/unittest_nodes.py
diff --git a/test/unittest_python3.py b/astroid/tests/unittest_python3.py
index e1502937..e1502937 100644
--- a/test/unittest_python3.py
+++ b/astroid/tests/unittest_python3.py
diff --git a/test/unittest_raw_building.py b/astroid/tests/unittest_raw_building.py
index 17057d55..17057d55 100644
--- a/test/unittest_raw_building.py
+++ b/astroid/tests/unittest_raw_building.py
diff --git a/test/unittest_regrtest.py b/astroid/tests/unittest_regrtest.py
index f40991ff..f40991ff 100644
--- a/test/unittest_regrtest.py
+++ b/astroid/tests/unittest_regrtest.py
diff --git a/test/unittest_scoped_nodes.py b/astroid/tests/unittest_scoped_nodes.py
index 824e35ff..824e35ff 100644
--- a/test/unittest_scoped_nodes.py
+++ b/astroid/tests/unittest_scoped_nodes.py
diff --git a/test/unittest_utils.py b/astroid/tests/unittest_utils.py
index 999f7ed1..999f7ed1 100644
--- a/test/unittest_utils.py
+++ b/astroid/tests/unittest_utils.py
diff --git a/utils.py b/astroid/utils.py
index ae72a92c..ae72a92c 100644
--- a/utils.py
+++ b/astroid/utils.py
diff --git a/setup.py b/setup.py
index 2e4f8533..bd5be283 100644
--- a/setup.py
+++ b/setup.py
@@ -17,39 +17,17 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with astroid.  If not, see <http://www.gnu.org/licenses/>.
-"""Generic Setup script, takes package info from __pkginfo__.py file.
-"""
-__docformat__ = "restructuredtext en"
+"""Setup script for astroid."""
+from setuptools import setup, find_packages
+from astroid import __pkginfo__
+from astroid.__pkginfo__ import modname, version, license, description, \
+    web, author, author_email, distname, install_requires, classifiers
 
-import os
-import sys
-from os.path import isdir, exists, join
+with open('README') as fobj:
+    long_description = fobj.read()
 
-from setuptools import setup
 
-sys.modules.pop('__pkginfo__', None)
-# import optional features
-__pkginfo__ = __import__("__pkginfo__")
-# import required features
-from __pkginfo__ import modname, version, license, description, \
-    web, author, author_email
-
-distname = getattr(__pkginfo__, 'distname', modname)
-data_files = getattr(__pkginfo__, 'data_files', None)
-include_dirs = getattr(__pkginfo__, 'include_dirs', [])
-install_requires = getattr(__pkginfo__, 'install_requires', None)
-classifiers = getattr(__pkginfo__, 'classifiers', [])
-
-if exists('README'):
-    long_description = open('README').read()
-else:
-    long_description = ''
-
-
-def install(**kwargs):
-    """setup entry point"""
-    if '--force-manifest' in sys.argv:
-        sys.argv.remove('--force-manifest')
+def install():
     return setup(name = distname,
                  version = version,
                  license = license,
@@ -59,25 +37,11 @@ def install(**kwargs):
                  author = author,
                  author_email = author_email,
                  url = web,
-                 data_files = data_files,
                  include_package_data = True,
                  install_requires = install_requires,
-                 package_dir = {modname: '.'},
-                 packages = [modname],
-                 package_data = {
-                     '': ['brain/*.py', 
-                          'test/regrtest_data/absimp/*.py', 
-                          'test/regrtest_data/package/*.py',
-                          'test/regrtest_data/package/subpackage/*.py',
-                          'test/regrtest_data/absimp/sidepackage/*.py',
-                          'test/regrtest_data/unicode_package/*.py',
-                          'test/regrtest_data/unicode_package/core/*.py',
-                          'test/data*/*.egg',
-                          'test/data*/*.zip',
-                          ],
-                 },
-                 **kwargs
+                 packages = find_packages(),
                  )
 
+
 if __name__ == '__main__' :
     install()
diff --git a/tox.ini b/tox.ini
index 3a0244f0..f35e0d53 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,5 +6,5 @@ envlist = py27, py33
 deps =

   logilab-common

   six

-changedir = {envsitepackagesdir}/astroid/test

+changedir = {envsitepackagesdir}/astroid/tests

 commands = python -Wi -m unittest discover -v -p "unittest*.py"