diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css
index 33f370eaba1d..76e2d493e9dd 100644
--- a/django/contrib/admin/static/admin/css/forms.css
+++ b/django/contrib/admin/static/admin/css/forms.css
@@ -357,7 +357,7 @@ body.popup .submit-row {
     width: 48em;
 }
 
-.flatpages-flatpage #id_content {
+.app-flatpages.model-flatpage #id_content {
     height: 40.2em;
 }
 
diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py
index b1ab4340aa60..917e63cd5762 100644
--- a/tests/gis_tests/geoapp/test_functions.py
+++ b/tests/gis_tests/geoapp/test_functions.py
@@ -14,6 +14,7 @@
     Polygon,
     fromstr,
 )
+from django.contrib.gis.geos.libgeos import geos_version_tuple
 from django.contrib.gis.measure import Area
 from django.db import NotSupportedError, connection
 from django.db.models import IntegerField, Sum, Value
@@ -916,39 +917,46 @@ def test_argument_validation(self):
 
     @skipUnlessDBFeature("has_GeometryType_function")
     def test_geometry_type(self):
-        Feature.objects.bulk_create(
-            [
-                Feature(name="Point", geom=Point(0, 0)),
-                Feature(name="LineString", geom=LineString((0, 0), (1, 1))),
-                Feature(name="Polygon", geom=Polygon(((0, 0), (1, 0), (1, 1), (0, 0)))),
-                Feature(name="MultiPoint", geom=MultiPoint(Point(0, 0), Point(1, 1))),
-                Feature(
-                    name="MultiLineString",
-                    geom=MultiLineString(
-                        LineString((0, 0), (1, 1)), LineString((1, 1), (2, 2))
-                    ),
+        test_features = [
+            Feature(name="Point", geom=Point(0, 0)),
+            Feature(name="LineString", geom=LineString((0, 0), (1, 1))),
+            Feature(name="Polygon", geom=Polygon(((0, 0), (1, 0), (1, 1), (0, 0)))),
+            Feature(
+                name="MultiLineString",
+                geom=MultiLineString(
+                    LineString((0, 0), (1, 1)), LineString((1, 1), (2, 2))
                 ),
-                Feature(
-                    name="MultiPolygon",
-                    geom=MultiPolygon(
-                        Polygon(((0, 0), (1, 0), (1, 1), (0, 0))),
-                        Polygon(((1, 1), (2, 1), (2, 2), (1, 1))),
-                    ),
+            ),
+            Feature(
+                name="MultiPolygon",
+                geom=MultiPolygon(
+                    Polygon(((0, 0), (1, 0), (1, 1), (0, 0))),
+                    Polygon(((1, 1), (2, 1), (2, 2), (1, 1))),
                 ),
-            ]
-        )
-
-        expected_results = {
+            ),
+        ]
+        expected_results = [
             ("POINT", Point),
             ("LINESTRING", LineString),
             ("POLYGON", Polygon),
-            ("MULTIPOINT", MultiPoint),
             ("MULTILINESTRING", MultiLineString),
             ("MULTIPOLYGON", MultiPolygon),
-        }
-
-        for geom_type, geom_class in expected_results:
-            with self.subTest(geom_type=geom_type):
+        ]
+        # GEOSWKTWriter_write() behavior was changed in GEOS 3.12+ to include
+        # parentheses for sub-members. MariaDB doesn't accept WKT
+        # representations with additional parentheses for MultiPoint. This is
+        # an accepted bug (MDEV-36166) in MariaDB that should be fixed in the
+        # future.
+        if not connection.ops.mariadb or geos_version_tuple() < (3, 12):
+            test_features.append(
+                Feature(name="MultiPoint", geom=MultiPoint(Point(0, 0), Point(1, 1)))
+            )
+            expected_results.append(("MULTIPOINT", MultiPoint))
+        for test_feature, (geom_type, geom_class) in zip(
+            test_features, expected_results, strict=True
+        ):
+            with self.subTest(geom_type=geom_type, geom=test_feature.geom.wkt):
+                test_feature.save()
                 obj = (
                     Feature.objects.annotate(
                         geometry_type=functions.GeometryType("geom")