Use the class decorator syntax available in Python >= 2.6. Refs #17965.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37

10 files changed, 116 insertions, 141 deletions

diff --git a/tests/modeltests/proxy_model_inheritance/tests.py b/tests/modeltests/proxy_model_inheritance/tests.py
index a048e1aabe..ae5ab20b5f 100644
--- a/tests/modeltests/proxy_model_inheritance/tests.py
+++ b/tests/modeltests/proxy_model_inheritance/tests.py
@@ -18,7 +18,7 @@ from django.test import TransactionTestCase
 from django.test.utils import override_settings
 
 
-# @override_settings(INSTALLED_APPS=('app1', 'app2'))
+@override_settings(INSTALLED_APPS=('app1', 'app2'))
 class ProxyModelInheritanceTests(TransactionTestCase):
 
     def setUp(self):
@@ -41,5 +41,3 @@ class ProxyModelInheritanceTests(TransactionTestCase):
         from .app2.models import NiceModel
         self.assertEqual(NiceModel.objects.all().count(), 0)
         self.assertEqual(ProxyModel.objects.all().count(), 0)
-
-ProxyModelInheritanceTests = override_settings(INSTALLED_APPS=('app1', 'app2'))(ProxyModelInheritanceTests)
diff --git a/tests/modeltests/timezones/tests.py b/tests/modeltests/timezones/tests.py
index b1e22e1a55..7505503d1f 100644
--- a/tests/modeltests/timezones/tests.py
+++ b/tests/modeltests/timezones/tests.py
@@ -74,7 +74,7 @@ class BaseDateTimeTests(TestCase):
             time.tzset()
 
 
-#@override_settings(USE_TZ=False)
+@override_settings(USE_TZ=False)
 class LegacyDatabaseTests(BaseDateTimeTests):
 
     def test_naive_datetime(self):
@@ -268,14 +268,11 @@ class LegacyDatabaseTests(BaseDateTimeTests):
                 [event],
                 transform=lambda d: d)
 
-LegacyDatabaseTests = override_settings(USE_TZ=False)(LegacyDatabaseTests)
 
-
-#@override_settings(USE_TZ=True)
+@override_settings(USE_TZ=True)
 class NewDatabaseTests(BaseDateTimeTests):
 
     @requires_tz_support
-    @skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
     def test_naive_datetime(self):
         dt = datetime.datetime(2011, 9, 1, 13, 20, 30)
         with warnings.catch_warnings(record=True) as recorded:
@@ -289,7 +286,6 @@ class NewDatabaseTests(BaseDateTimeTests):
         self.assertEqual(event.dt, dt.replace(tzinfo=EAT))
 
     @requires_tz_support
-    @skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
     def test_datetime_from_date(self):
         dt = datetime.date(2011, 9, 1)
         with warnings.catch_warnings(record=True) as recorded:
@@ -302,7 +298,6 @@ class NewDatabaseTests(BaseDateTimeTests):
         self.assertEqual(event.dt, datetime.datetime(2011, 9, 1, tzinfo=EAT))
 
     @requires_tz_support
-    @skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
     @skipUnlessDBFeature('supports_microsecond_precision')
     def test_naive_datetime_with_microsecond(self):
         dt = datetime.datetime(2011, 9, 1, 13, 20, 30, 405060)
@@ -317,7 +312,6 @@ class NewDatabaseTests(BaseDateTimeTests):
         self.assertEqual(event.dt, dt.replace(tzinfo=EAT))
 
     @requires_tz_support
-    @skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
     @skipIfDBFeature('supports_microsecond_precision')
     def test_naive_datetime_with_microsecond_unsupported(self):
         dt = datetime.datetime(2011, 9, 1, 13, 20, 30, 405060)
@@ -400,7 +394,6 @@ class NewDatabaseTests(BaseDateTimeTests):
         self.assertEqual(Event.objects.filter(dt__range=(prev, next)).count(), 1)
 
     @requires_tz_support
-    @skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
     def test_query_filter_with_naive_datetime(self):
         dt = datetime.datetime(2011, 9, 1, 12, 20, 30, tzinfo=EAT)
         Event.objects.create(dt=dt)
@@ -492,8 +485,6 @@ class NewDatabaseTests(BaseDateTimeTests):
         e = MaybeEvent.objects.create()
         self.assertEqual(e.dt, None)
 
-NewDatabaseTests = override_settings(USE_TZ=True)(NewDatabaseTests)
-
 
 class SerializationTests(BaseDateTimeTests):
 
@@ -648,7 +639,7 @@ class SerializationTests(BaseDateTimeTests):
             obj = serializers.deserialize('yaml', data).next().object
             self.assertEqual(obj.dt.replace(tzinfo=UTC), dt)
 
-#@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
+@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
 class TemplateTests(BaseDateTimeTests):
 
     @requires_tz_support
@@ -887,9 +878,8 @@ class TemplateTests(BaseDateTimeTests):
         with timezone.override(ICT):
             self.assertEqual(tpl.render(Context({})), "+0700")
 
-TemplateTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)(TemplateTests)
 
-#@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=False)
+@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=False)
 class LegacyFormsTests(BaseDateTimeTests):
 
     def test_form(self):
@@ -923,9 +913,8 @@ class LegacyFormsTests(BaseDateTimeTests):
         e = Event.objects.get()
         self.assertEqual(e.dt, datetime.datetime(2011, 9, 1, 13, 20, 30))
 
-LegacyFormsTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=False)(LegacyFormsTests)
 
-#@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
+@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
 class NewFormsTests(BaseDateTimeTests):
 
     @requires_tz_support
@@ -970,9 +959,8 @@ class NewFormsTests(BaseDateTimeTests):
         e = Event.objects.get()
         self.assertEqual(e.dt, datetime.datetime(2011, 9, 1, 10, 20, 30, tzinfo=UTC))
 
-NewFormsTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)(NewFormsTests)
 
-#@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
+@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
 class AdminTests(BaseDateTimeTests):
 
     urls = 'modeltests.timezones.urls'
@@ -1023,8 +1011,6 @@ class AdminTests(BaseDateTimeTests):
             response = self.client.get(reverse('admin:timezones_timestamp_change', args=(t.pk,)))
         self.assertContains(response, t.created.astimezone(ICT).isoformat())
 
-AdminTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)(AdminTests)
-
 
 class UtilitiesTests(BaseDateTimeTests):
 
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index b4718447d1..564e4924bb 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -3315,7 +3315,7 @@ try:
 except ImportError:
     docutils = None
 
-#@unittest.skipUnless(docutils, "no docutils installed.")
+@unittest.skipUnless(docutils, "no docutils installed.")
 class AdminDocsTest(TestCase):
     urls = "regressiontests.admin_views.urls"
     fixtures = ['admin-views-users.xml']
@@ -3357,7 +3357,6 @@ class AdminDocsTest(TestCase):
         self.assertContains(response, '<h3 id="built_in-add">add</h3>', html=True)
         self.assertContains(response, '<li><a href="#built_in-add">add</a></li>', html=True)
 
-AdminDocsTest = unittest.skipUnless(docutils, "no docutils installed.")(AdminDocsTest)
 
 class ValidXHTMLTests(TestCase):
     urls = "regressiontests.admin_views.urls"
diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py
index 6dbc03db32..00ccda6102 100644
--- a/tests/regressiontests/cache/tests.py
+++ b/tests/regressiontests/cache/tests.py
@@ -824,7 +824,9 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase):
         self.assertTrue("Cache table 'test cache table' could not be created" in err.getvalue())
 
 
-DBCacheWithTimeZoneTests = override_settings(USE_TZ=True)(DBCacheTests)
+@override_settings(USE_TZ=True)
+class DBCacheWithTimeZoneTests(DBCacheTests):
+    pass
 
 
 class DBCacheRouter(object):
@@ -927,6 +929,9 @@ class LocMemCacheTests(unittest.TestCase, BaseCacheTests):
 # To check the memcached backend, the test settings file will
 # need to contain a cache backend setting that points at
 # your memcache server.
+@unittest.skipUnless(
+    settings.CACHES[DEFAULT_CACHE_ALIAS]['BACKEND'].startswith('django.core.cache.backends.memcached.'),
+    "memcached not available")
 class MemcachedCacheTests(unittest.TestCase, BaseCacheTests):
     backend_name = 'django.core.cache.backends.memcached.MemcachedCache'
 
@@ -956,8 +961,6 @@ class MemcachedCacheTests(unittest.TestCase, BaseCacheTests):
         # memcached limits key length to 250
         self.assertRaises(Exception, self.cache.set, 'a' * 251, 'value')
 
-MemcachedCacheTests = unittest.skipUnless(settings.CACHES[DEFAULT_CACHE_ALIAS]['BACKEND'].startswith('django.core.cache.backends.memcached.'), "memcached not available")(MemcachedCacheTests)
-
 
 class FileBasedCacheTests(unittest.TestCase, BaseCacheTests):
     """
@@ -1048,6 +1051,16 @@ class GetCacheTests(unittest.TestCase):
         self.assertTrue(cache.closed)
 
 
+@override_settings(
+        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
+        CACHE_MIDDLEWARE_SECONDS=1,
+        CACHES={
+            'default': {
+                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            },
+        },
+        USE_I18N=False,
+)
 class CacheUtils(TestCase):
     """TestCase for django.utils.cache functions."""
 
@@ -1144,27 +1157,28 @@ class CacheUtils(TestCase):
             parts = set(cc_delim_re.split(response['Cache-Control']))
             self.assertEqual(parts, expected_cc)
 
-CacheUtils = override_settings(
-        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
-        CACHE_MIDDLEWARE_SECONDS=1,
+
+@override_settings(
         CACHES={
             'default': {
                 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+                'KEY_PREFIX': 'cacheprefix',
             },
         },
-        USE_I18N=False,
-)(CacheUtils)
+)
+class PrefixedCacheUtils(CacheUtils):
+    pass
+
 
-PrefixedCacheUtils = override_settings(
+@override_settings(
+        CACHE_MIDDLEWARE_SECONDS=60,
+        CACHE_MIDDLEWARE_KEY_PREFIX='test',
         CACHES={
             'default': {
                 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-                'KEY_PREFIX': 'cacheprefix',
             },
         },
-)(CacheUtils)
-
-
+)
 class CacheHEADTest(TestCase):
 
     def setUp(self):
@@ -1216,17 +1230,19 @@ class CacheHEADTest(TestCase):
         self.assertNotEqual(get_cache_data, None)
         self.assertEqual(test_content, get_cache_data.content)
 
-CacheHEADTest = override_settings(
-        CACHE_MIDDLEWARE_SECONDS=60,
-        CACHE_MIDDLEWARE_KEY_PREFIX='test',
+
+@override_settings(
+        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
         CACHES={
             'default': {
                 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
             },
         },
-)(CacheHEADTest)
-
-
+        LANGUAGES=(
+            ('en', 'English'),
+            ('es', 'Spanish'),
+        ),
+)
 class CacheI18nTest(TestCase):
 
     def setUp(self):
@@ -1391,33 +1407,39 @@ class CacheI18nTest(TestCase):
         # reset the language
         translation.deactivate()
 
-CacheI18nTest = override_settings(
-        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            },
-        },
-        LANGUAGES=(
-            ('en', 'English'),
-            ('es', 'Spanish'),
-        ),
-)(CacheI18nTest)
 
-PrefixedCacheI18nTest = override_settings(
+@override_settings(
         CACHES={
             'default': {
                 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
                 'KEY_PREFIX': 'cacheprefix'
             },
         },
-)(CacheI18nTest)
+)
+class PrefixedCacheI18nTest(CacheI18nTest):
+    pass
 
 
 def hello_world_view(request, value):
     return HttpResponse('Hello World %s' % value)
 
 
+@override_settings(
+        CACHE_MIDDLEWARE_ALIAS='other',
+        CACHE_MIDDLEWARE_KEY_PREFIX='middlewareprefix',
+        CACHE_MIDDLEWARE_SECONDS=30,
+        CACHE_MIDDLEWARE_ANONYMOUS_ONLY=False,
+        CACHES={
+            'default': {
+                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            },
+            'other': {
+                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+                'LOCATION': 'other',
+                'TIMEOUT': '1',
+            },
+        },
+)
 class CacheMiddlewareTest(TestCase):
 
     def setUp(self):
@@ -1635,24 +1657,17 @@ class CacheMiddlewareTest(TestCase):
         response = other_with_timeout_view(request, '18')
         self.assertEqual(response.content, 'Hello World 18')
 
-CacheMiddlewareTest = override_settings(
-        CACHE_MIDDLEWARE_ALIAS='other',
-        CACHE_MIDDLEWARE_KEY_PREFIX='middlewareprefix',
-        CACHE_MIDDLEWARE_SECONDS=30,
-        CACHE_MIDDLEWARE_ANONYMOUS_ONLY=False,
+
+@override_settings(
+        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
+        CACHE_MIDDLEWARE_SECONDS=1,
         CACHES={
             'default': {
                 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
             },
-            'other': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-                'LOCATION': 'other',
-                'TIMEOUT': '1',
-            },
         },
-)(CacheMiddlewareTest)
-
-
+        USE_I18N=False,
+)
 class TestWithTemplateResponse(TestCase):
     """
     Tests various headers w/ TemplateResponse.
@@ -1740,17 +1755,6 @@ class TestWithTemplateResponse(TestCase):
         response = response.render()
         self.assertTrue(response.has_header('ETag'))
 
-TestWithTemplateResponse = override_settings(
-        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
-        CACHE_MIDDLEWARE_SECONDS=1,
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            },
-        },
-        USE_I18N=False,
-)(TestWithTemplateResponse)
-
 
 class TestEtagWithAdmin(TestCase):
     # See https://code.djangoproject.com/ticket/16003
diff --git a/tests/regressiontests/forms/tests/media.py b/tests/regressiontests/forms/tests/media.py
index 69c0af920c..c492a1e539 100644
--- a/tests/regressiontests/forms/tests/media.py
+++ b/tests/regressiontests/forms/tests/media.py
@@ -5,6 +5,10 @@ from django.test import TestCase
 from django.test.utils import override_settings
 
 
+@override_settings(
+    STATIC_URL=None,
+    MEDIA_URL='http://media.example.com/media/',
+)
 class FormsMediaTestCase(TestCase):
     """Tests for the media handling on widgets and forms"""
 
@@ -451,12 +455,11 @@ class FormsMediaTestCase(TestCase):
 <link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
 <link href="/some/form/css" type="text/css" media="all" rel="stylesheet" />""")
 
-FormsMediaTestCase = override_settings(
-    STATIC_URL=None,
-    MEDIA_URL='http://media.example.com/media/',
-)(FormsMediaTestCase)
-
 
+@override_settings(
+    STATIC_URL='http://media.example.com/static/',
+    MEDIA_URL='http://media.example.com/media/',
+)
 class StaticFormsMediaTestCase(TestCase):
     """Tests for the media handling on widgets and forms"""
 
@@ -902,9 +905,3 @@ class StaticFormsMediaTestCase(TestCase):
 <link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
 <link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
 <link href="/some/form/css" type="text/css" media="all" rel="stylesheet" />""")
-
-
-StaticFormsMediaTestCase = override_settings(
-    STATIC_URL='http://media.example.com/static/',
-    MEDIA_URL='http://media.example.com/media/',
-)(StaticFormsMediaTestCase)
diff --git a/tests/regressiontests/i18n/contenttypes/tests.py b/tests/regressiontests/i18n/contenttypes/tests.py
index a44895f0cc..baaa6ada42 100644
--- a/tests/regressiontests/i18n/contenttypes/tests.py
+++ b/tests/regressiontests/i18n/contenttypes/tests.py
@@ -8,6 +8,17 @@ from django.test.utils import override_settings
 from django.utils import translation
 
 
+@override_settings(
+    USE_I18N=True,
+    LOCALE_PATHS=(
+        os.path.join(os.path.dirname(__file__), 'locale'),
+    ),
+    LANGUAGE_CODE='en',
+    LANGUAGES=(
+        ('en', 'English'),
+        ('fr', 'French'),
+    ),
+)
 class ContentTypeTests(TestCase):
     def test_verbose_name(self):
         company_type = ContentType.objects.get(app_label='i18n', model='company')
@@ -20,15 +31,3 @@ class ContentTypeTests(TestCase):
         company_type = ContentType.objects.get(app_label='i18n', model='company')
         company_type.name = 'Other'
         self.assertEqual(unicode(company_type), 'Other')
-
-ContentTypeTests = override_settings(
-    USE_I18N=True,
-    LOCALE_PATHS=(
-        os.path.join(os.path.dirname(__file__), 'locale'),
-    ),
-    LANGUAGE_CODE='en',
-    LANGUAGES=(
-        ('en', 'English'),
-        ('fr', 'French'),
-    ),
-)(ContentTypeTests)
diff --git a/tests/regressiontests/i18n/patterns/tests.py b/tests/regressiontests/i18n/patterns/tests.py
index df7beac239..d8ca3accd6 100644
--- a/tests/regressiontests/i18n/patterns/tests.py
+++ b/tests/regressiontests/i18n/patterns/tests.py
@@ -9,21 +9,7 @@ from django.template import Template, Context
 from django.utils import translation
 
 
-class URLTestCaseBase(TestCase):
-    """
-    TestCase base-class for the URL tests.
-    """
-    urls = 'regressiontests.i18n.patterns.urls.default'
-
-    def setUp(self):
-        # Make sure the cache is empty before we are doing our tests.
-        clear_url_caches()
-
-    def tearDown(self):
-        # Make sure we will leave an empty cache for other testcases.
-        clear_url_caches()
-
-URLTestCaseBase = override_settings(
+@override_settings(
     USE_I18N=True,
     LOCALE_PATHS=(
         os.path.join(os.path.dirname(__file__), 'locale'),
@@ -41,7 +27,20 @@ URLTestCaseBase = override_settings(
         'django.middleware.locale.LocaleMiddleware',
         'django.middleware.common.CommonMiddleware',
     ),
-)(URLTestCaseBase)
+)
+class URLTestCaseBase(TestCase):
+    """
+    TestCase base-class for the URL tests.
+    """
+    urls = 'regressiontests.i18n.patterns.urls.default'
+
+    def setUp(self):
+        # Make sure the cache is empty before we are doing our tests.
+        clear_url_caches()
+
+    def tearDown(self):
+        # Make sure we will leave an empty cache for other testcases.
+        clear_url_caches()
 
 
 class URLPrefixTests(URLTestCaseBase):
diff --git a/tests/regressiontests/middleware/tests.py b/tests/regressiontests/middleware/tests.py
index 6a1896a266..3adb10964a 100644
--- a/tests/regressiontests/middleware/tests.py
+++ b/tests/regressiontests/middleware/tests.py
@@ -584,6 +584,7 @@ class GZipMiddlewareTest(TestCase):
         self.assertEqual(r.get('Content-Encoding'), None)
 
 
+@override_settings(USE_ETAGS=True)
 class ETagGZipMiddlewareTest(TestCase):
     """
     Tests if the ETag middleware behaves correctly with GZip middleware.
@@ -610,6 +611,3 @@ class ETagGZipMiddlewareTest(TestCase):
         nogzip_etag = response.get('ETag')
 
         self.assertNotEqual(gzip_etag, nogzip_etag)
-ETagGZipMiddlewareTest = override_settings(
-    USE_ETAGS=True,
-)(ETagGZipMiddlewareTest)
diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/regressiontests/settings_tests/tests.py
index 47e5b08952..48dc1a1994 100644
--- a/tests/regressiontests/settings_tests/tests.py
+++ b/tests/regressiontests/settings_tests/tests.py
@@ -6,7 +6,7 @@ from django.test import TransactionTestCase, TestCase, signals
 from django.test.utils import override_settings
 
 
-# @override_settings(TEST='override')
+@override_settings(TEST='override')
 class FullyDecoratedTranTestCase(TransactionTestCase):
 
     def test_override(self):
@@ -22,9 +22,8 @@ class FullyDecoratedTranTestCase(TransactionTestCase):
     def test_decorated_testcase_module(self):
         self.assertEquals(FullyDecoratedTranTestCase.__module__, __name__)
 
-FullyDecoratedTranTestCase = override_settings(TEST='override')(FullyDecoratedTranTestCase)
 
-# @override_settings(TEST='override')
+@override_settings(TEST='override')
 class FullyDecoratedTestCase(TestCase):
 
     def test_override(self):
@@ -34,8 +33,6 @@ class FullyDecoratedTestCase(TestCase):
     def test_method_override(self):
         self.assertEqual(settings.TEST, 'override2')
 
-FullyDecoratedTestCase = override_settings(TEST='override')(FullyDecoratedTestCase)
-
 
 class ClassDecoratedTestCaseSuper(TestCase):
     """
@@ -47,6 +44,7 @@ class ClassDecoratedTestCaseSuper(TestCase):
         pass
 
 
+@override_settings(TEST='override')
 class ClassDecoratedTestCase(ClassDecoratedTestCaseSuper):
     def test_override(self):
         self.assertEqual(settings.TEST, 'override')
@@ -66,7 +64,6 @@ class ClassDecoratedTestCase(ClassDecoratedTestCaseSuper):
         except RuntimeError, e:
             self.fail()
 
-ClassDecoratedTestCase = override_settings(TEST='override')(ClassDecoratedTestCase)
 
 class SettingGetter(object):
     def __init__(self):
diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/regressiontests/staticfiles_tests/tests.py
index 7639161fc0..6914128989 100644
--- a/tests/regressiontests/staticfiles_tests/tests.py
+++ b/tests/regressiontests/staticfiles_tests/tests.py
@@ -98,9 +98,9 @@ class BaseStaticFilesTestCase(object):
         self.assertRaises(exc, self.assertStaticRenders, path, result, **kwargs)
 
 
+@override_settings(**TEST_SETTINGS)
 class StaticFilesTestCase(BaseStaticFilesTestCase, TestCase):
     pass
-StaticFilesTestCase = override_settings(**TEST_SETTINGS)(StaticFilesTestCase)
 
 
 class BaseCollectionTestCase(BaseStaticFilesTestCase):
@@ -343,17 +343,21 @@ class TestCollectionFilesOverride(CollectionTestCase):
         self.assertFileContains('file2.txt', 'duplicate of file2.txt')
 
 
+@override_settings(
+    STATICFILES_STORAGE='regressiontests.staticfiles_tests.storage.DummyStorage',
+)
 class TestCollectionNonLocalStorage(CollectionTestCase, TestNoFilesCreated):
     """
     Tests for #15035
     """
     pass
 
-TestCollectionNonLocalStorage = override_settings(
-    STATICFILES_STORAGE='regressiontests.staticfiles_tests.storage.DummyStorage',
-)(TestCollectionNonLocalStorage)
-
 
+# we set DEBUG to False here since the template tag wouldn't work otherwise
+@override_settings(**dict(TEST_SETTINGS,
+    STATICFILES_STORAGE='django.contrib.staticfiles.storage.CachedStaticFilesStorage',
+    DEBUG=False,
+))
 class TestCollectionCachedStorage(BaseCollectionTestCase,
         BaseStaticFilesTestCase, TestCase):
     """
@@ -515,12 +519,6 @@ class TestCollectionCachedStorage(BaseCollectionTestCase,
         self.assertEqual(cache_key, 'staticfiles:e95bbc36387084582df2a70750d7b351')
 
 
-# we set DEBUG to False here since the template tag wouldn't work otherwise
-TestCollectionCachedStorage = override_settings(**dict(TEST_SETTINGS,
-    STATICFILES_STORAGE='django.contrib.staticfiles.storage.CachedStaticFilesStorage',
-    DEBUG=False,
-))(TestCollectionCachedStorage)
-
 if sys.platform != 'win32':
 
     class TestCollectionLinks(CollectionTestCase, TestDefaults):