diff --git a/scikits/learn/__init__.py b/scikits/learn/__init__.py
index 4fa359a7c452e5c6438710496f0cdeadf38f27f0..d0bbd6c5c4429aefc842b84acec24350176a9635 100644
--- a/scikits/learn/__init__.py
+++ b/scikits/learn/__init__.py
@@ -31,7 +31,7 @@ try:
     class NoseTester(nosetester.NoseTester):
         """ Subclass numpy's NoseTester to add doctests by default
         """
-        def test(self, label='fast', verbose=1, extra_argv=None, 
+        def test(self, label='fast', verbose=1, extra_argv=['--exe'], 
                         doctests=True, coverage=False):
             return super(NoseTester, self).test(label=label, verbose=verbose,
                                     extra_argv=extra_argv,
diff --git a/scikits/learn/datasets/setup.py b/scikits/learn/datasets/setup.py
old mode 100755
new mode 100644
diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py
index c3bcdf543ddd663540c567d508ab6b63b9227593..71609c336ceb3e61c76330404015e281ed19b7cc 100644
--- a/scikits/learn/setup.py
+++ b/scikits/learn/setup.py
@@ -125,7 +125,7 @@ def configuration(parent_package='', top_path=None):
     config.add_subpackage('glm')
 
     # add the test directory
-    config.add_data_dir('tests')
+    config.add_subpackage('tests')
 
     return config