diff --git a/sklearn/__init__.py b/sklearn/__init__.py
index 7651c6a482cd9536634ae1693d1a144c79fb12ca..133a742a8f0b6828ed2b367c790d7568d7e11f17 100644
--- a/sklearn/__init__.py
+++ b/sklearn/__init__.py
@@ -47,9 +47,13 @@ See the web page http://scikit-learn.org/stable/install.html#testing
 for more information.
 
 This function, `sklearn.test()` does not do anything. It does not run
-the tests and will be deprecated in release 0.16.
+the tests and will be removed in release 0.16.
 """, stacklevel=2)
 
+    # The following line is useful so that nosetests doesn't consider
+    # "test" as a test function
+    test.__test__ = False
+
     __all__ = ['cross_validation', 'cluster', 'covariance',
                'datasets', 'decomposition', 'feature_extraction',
                'feature_selection', 'semi_supervised',