diff --git a/tests/admin_views/customadmin.py b/tests/admin_views/customadmin.py
index ed3a3dea7a..f964d6cffb 100644
--- a/tests/admin_views/customadmin.py
+++ b/tests/admin_views/customadmin.py
@@ -13,6 +13,7 @@ from . import models, forms, admin as base_admin
 
 
 class Admin2(admin.AdminSite):
+    app_index_template = 'custom_admin/app_index.html'
     login_form = forms.CustomAdminAuthenticationForm
     login_template = 'custom_admin/login.html'
     logout_template = 'custom_admin/logout.html'
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index fdb5d7d436..8b44d0dcd2 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -806,6 +806,12 @@ class CustomModelAdminTest(AdminViewBasicTestCase):
         self.assertTemplateUsed(response, 'custom_admin/index.html')
         self.assertContains(response, 'Hello from a custom index template *bar*')
 
+    def testCustomAdminSiteAppIndexViewandTemplate(self):
+        response = self.client.get('/test_admin/admin2/admin_views/')
+        self.assertIsInstance(response, TemplateResponse)
+        self.assertTemplateUsed(response, 'custom_admin/app_index.html')
+        self.assertContains(response, 'Hello from a custom app_index template')
+
     def testCustomAdminSitePasswordChangeTemplate(self):
         response = self.client.get('/test_admin/admin2/password_change/')
         self.assertIsInstance(response, TemplateResponse)
diff --git a/tests/templates/custom_admin/app_index.html b/tests/templates/custom_admin/app_index.html
new file mode 100644
index 0000000000..3dfae814a7
--- /dev/null
+++ b/tests/templates/custom_admin/app_index.html
@@ -0,0 +1,6 @@
+{% extends "admin/app_index.html" %}
+
+{% block content %}
+Hello from a custom app_index template
+{{ block.super }}
+{% endblock %}