diff --git a/setup.cfg.template b/setup.cfg.template
index e64a9248111f..f9caa97b4606 100644
--- a/setup.cfg.template
+++ b/setup.cfg.template
@@ -22,10 +22,10 @@
 
 [packages]
 # There are a number of subpackages of matplotlib that are considered
-# optional.  They are all installed by default, but they may be turned
-# off here.
+# optional. All except tests are installed by default, but that can
+# be changed here.
 #
-#tests = True
+#tests = False
 #sample_data = True
 #toolkits = True
 # Tests for the toolkits are only automatically installed
diff --git a/setupext.py b/setupext.py
index 0a31d074af58..c9bfc1c22580 100644
--- a/setupext.py
+++ b/setupext.py
@@ -604,6 +604,7 @@ class OptionalPackage(SetupPackage):
     optional = True
     force = False
     config_category = "packages"
+    default_config = "auto"
 
     @classmethod
     def get_config(cls):
@@ -613,7 +614,7 @@ def get_config(cls):
         insensitively defined as 1, true, yes, on for True) or opted-out (case
         insensitively defined as 0, false, no, off for False).
         """
-        conf = "auto"
+        conf = cls.default_config
         if config is not None and config.has_option(cls.config_category, cls.name):
             try:
                 conf = config.getboolean(cls.config_category, cls.name)
@@ -788,6 +789,7 @@ def get_namespace_packages(self):
 class Tests(OptionalPackage):
     name = "tests"
     nose_min_version = '0.11.1'
+    default_config = False
 
     def check(self):
         super(Tests, self).check()