diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 9add772d7..841510dd3 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -235,11 +235,6 @@ class ObjectChangeLogView(View):
         # fall back to using base.html.
         if self.base_template is None:
             self.base_template = f"{model._meta.app_label}/{model._meta.model_name}.html"
-            # TODO: This can be removed once an object view has been established for every model.
-            try:
-                template.loader.get_template(self.base_template)
-            except template.TemplateDoesNotExist:
-                self.base_template = 'base.html'
 
         return render(request, 'extras/object_changelog.html', {
             'object': obj,
@@ -368,11 +363,6 @@ class ObjectJournalView(View):
         # fall back to using base.html.
         if self.base_template is None:
             self.base_template = f"{model._meta.app_label}/{model._meta.model_name}.html"
-            # TODO: This can be removed once an object view has been established for every model.
-            try:
-                template.loader.get_template(self.base_template)
-            except template.TemplateDoesNotExist:
-                self.base_template = 'base.html'
 
         return render(request, 'extras/object_journal.html', {
             'object': obj,
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index aa8db346d..703780f95 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -1018,6 +1018,7 @@ class ViewTestCases:
         maxDiff = None
 
     class OrganizationalObjectViewTestCase(
+        GetObjectViewTestCase,
         GetObjectChangelogViewTestCase,
         CreateObjectViewTestCase,
         EditObjectViewTestCase,