2 files changed, 14 insertions, 3 deletions
diff --git a/tests/regressiontests/admin_registration/models.py b/tests/regressiontests/admin_registration/models.py
index 4a2d4e9614..61689f31b7 100644
--- a/tests/regressiontests/admin_registration/models.py
+++ b/tests/regressiontests/admin_registration/models.py
@@ -7,5 +7,9 @@ from django.db import models
 class Person(models.Model):
     name = models.CharField(max_length=200)
 
-class Place(models.Model):
+class Location(models.Model):
+    class Meta:
+        abstract = True
+
+class Place(Location):
     name = models.CharField(max_length=200)
diff --git a/tests/regressiontests/admin_registration/tests.py b/tests/regressiontests/admin_registration/tests.py
index e2a5d7e017..92e9d8a21e 100644
--- a/tests/regressiontests/admin_registration/tests.py
+++ b/tests/regressiontests/admin_registration/tests.py
@@ -1,8 +1,8 @@
 from django.test import TestCase
-
+from django.core.exceptions import ImproperlyConfigured
 from django.contrib import admin
 
-from models import Person, Place
+from models import Person, Place, Location
 
 class NameAdmin(admin.ModelAdmin):
     list_display = ['name']
@@ -52,3 +52,10 @@ class TestRegistration(TestCase):
             isinstance(self.site._registry[Place], admin.options.ModelAdmin)
         )
         self.assertEqual(self.site._registry[Place].search_fields, ['name'])
+
+    def test_abstract_model(self):
+        """
+        Exception is raised when trying to register an abstract model.
+        Refs #12004.
+        """
+        self.assertRaises(ImproperlyConfigured, self.site.register, Location)