diff --git a/tests/admin_util/__init__.py b/tests/admin_utils/__init__.py
similarity index 100%
rename from tests/admin_util/__init__.py
rename to tests/admin_utils/__init__.py
diff --git a/tests/admin_util/models.py b/tests/admin_utils/models.py
similarity index 100%
rename from tests/admin_util/models.py
rename to tests/admin_utils/models.py
diff --git a/tests/admin_util/tests.py b/tests/admin_utils/tests.py
similarity index 99%
rename from tests/admin_util/tests.py
rename to tests/admin_utils/tests.py
index dd2130e4848..01710e51ce7 100644
--- a/tests/admin_util/tests.py
+++ b/tests/admin_utils/tests.py
@@ -90,7 +90,7 @@ class NestedObjectsTests(TestCase):
         n.collect([Vehicle.objects.first()])
 
 
-class UtilTests(TestCase):
+class UtilsTests(TestCase):
     def test_values_from_lookup_field(self):
         """
         Regression test for #12654: lookup_field
diff --git a/tests/forms_tests/tests/test_util.py b/tests/forms_tests/tests/test_utils.py
similarity index 99%
rename from tests/forms_tests/tests/test_util.py
rename to tests/forms_tests/tests/test_utils.py
index c37affeb311..6e40e7565ce 100644
--- a/tests/forms_tests/tests/test_util.py
+++ b/tests/forms_tests/tests/test_utils.py
@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy
 from django.utils.encoding import python_2_unicode_compatible
 
 
-class FormsUtilTestCase(TestCase):
+class FormsUtilsTestCase(TestCase):
     # Tests for forms/utils.py module.
 
     def test_flatatt(self):