diff --git a/.github/workflows/coverage_comment.yml b/.github/workflows/coverage_comment.yml
index d63e6f4a75ad..42a5b0251f3b 100644
--- a/.github/workflows/coverage_comment.yml
+++ b/.github/workflows/coverage_comment.yml
@@ -15,8 +15,7 @@ jobs:
     if: >
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' &&
-      github.repository == 'django/django' &&
-      github.event.workflow_run.pull_requests[0] != null
+      github.repository == 'django/django'
     name: Post Coverage Comment
     runs-on: ubuntu-latest
     timeout-minutes: 60
diff --git a/django/contrib/admin/static/admin/css/changelists.css b/django/contrib/admin/static/admin/css/changelists.css
index 60cbaf21ebd2..3557097292cd 100644
--- a/django/contrib/admin/static/admin/css/changelists.css
+++ b/django/contrib/admin/static/admin/css/changelists.css
@@ -265,7 +265,8 @@
     font-weight: bold;
 }
 
-.change-list .toplinks a {
+.change-list .toplinks a,
+.change-list .toplinks span {
     font-size: 0.8125rem;
 }
 
diff --git a/django/contrib/admin/templates/admin/date_hierarchy.html b/django/contrib/admin/templates/admin/date_hierarchy.html
index c50885642844..2480ce7c31a6 100644
--- a/django/contrib/admin/templates/admin/date_hierarchy.html
+++ b/django/contrib/admin/templates/admin/date_hierarchy.html
@@ -1,5 +1,7 @@
+{% load i18n %}
 {% if show %}
-<nav class="toplinks">
+<nav class="toplinks" aria-labelledby="date-hierarchy-label">
+<span id="date-hierarchy-label">{% blocktranslate %}Filter by {{ field_name }}{% endblocktranslate %}</span>
 {% block date-hierarchy-toplinks %}
 {% block date-hierarchy-back %}
 {% if back %}<a href="{{ back.link }}" class="date-back">&lsaquo; {{ back.title }}</a>{% endif %}
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 43d87c0024aa..52aae9e58933 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -76,6 +76,7 @@ def pagination(cl):
 @register.tag(name="pagination")
 def pagination_tag(parser, token):
     return InclusionAdminNode(
+        "pagination",
         parser,
         token,
         func=pagination,
@@ -361,6 +362,7 @@ def result_list(cl):
 @register.tag(name="result_list")
 def result_list_tag(parser, token):
     return InclusionAdminNode(
+        "result_list",
         parser,
         token,
         func=result_list,
@@ -376,6 +378,7 @@ def date_hierarchy(cl):
     if cl.date_hierarchy:
         field_name = cl.date_hierarchy
         field = get_fields_from_path(cl.model, field_name)[-1]
+        field_verbose_name = field.verbose_name
         if isinstance(field, models.DateTimeField):
             dates_or_datetimes = "datetimes"
         else:
@@ -418,6 +421,7 @@ def link(filters):
                 "choices": [
                     {"title": capfirst(formats.date_format(day, "MONTH_DAY_FORMAT"))}
                 ],
+                "field_name": field_verbose_name,
             }
         elif year_lookup and month_lookup:
             days = getattr(cl.queryset, dates_or_datetimes)(field_name, "day")
@@ -440,6 +444,7 @@ def link(filters):
                     }
                     for day in days
                 ],
+                "field_name": field_verbose_name,
             }
         elif year_lookup:
             months = getattr(cl.queryset, dates_or_datetimes)(field_name, "month")
@@ -457,6 +462,7 @@ def link(filters):
                     }
                     for month in months
                 ],
+                "field_name": field_verbose_name,
             }
         else:
             years = getattr(cl.queryset, dates_or_datetimes)(field_name, "year")
@@ -470,12 +476,14 @@ def link(filters):
                     }
                     for year in years
                 ],
+                "field_name": field_verbose_name,
             }
 
 
 @register.tag(name="date_hierarchy")
 def date_hierarchy_tag(parser, token):
     return InclusionAdminNode(
+        "date_hierarchy",
         parser,
         token,
         func=date_hierarchy,
@@ -500,6 +508,7 @@ def search_form(cl):
 @register.tag(name="search_form")
 def search_form_tag(parser, token):
     return InclusionAdminNode(
+        "search_form",
         parser,
         token,
         func=search_form,
@@ -532,7 +541,7 @@ def admin_actions(context):
 @register.tag(name="admin_actions")
 def admin_actions_tag(parser, token):
     return InclusionAdminNode(
-        parser, token, func=admin_actions, template_name="actions.html"
+        "admin_actions", parser, token, func=admin_actions, template_name="actions.html"
     )
 
 
@@ -540,6 +549,7 @@ def admin_actions_tag(parser, token):
 def change_list_object_tools_tag(parser, token):
     """Display the row of change list object tools."""
     return InclusionAdminNode(
+        "change_list_object_tools",
         parser,
         token,
         func=lambda context: context,
diff --git a/django/contrib/admin/templatetags/admin_modify.py b/django/contrib/admin/templatetags/admin_modify.py
index 0e3046ae5aa6..c3d2ad01d903 100644
--- a/django/contrib/admin/templatetags/admin_modify.py
+++ b/django/contrib/admin/templatetags/admin_modify.py
@@ -51,6 +51,7 @@ def prepopulated_fields_js(context):
 @register.tag(name="prepopulated_fields_js")
 def prepopulated_fields_js_tag(parser, token):
     return InclusionAdminNode(
+        "prepopulated_fields_js",
         parser,
         token,
         func=prepopulated_fields_js,
@@ -115,7 +116,7 @@ def submit_row(context):
 @register.tag(name="submit_row")
 def submit_row_tag(parser, token):
     return InclusionAdminNode(
-        parser, token, func=submit_row, template_name="submit_line.html"
+        "submit_row", parser, token, func=submit_row, template_name="submit_line.html"
     )
 
 
@@ -123,6 +124,7 @@ def submit_row_tag(parser, token):
 def change_form_object_tools_tag(parser, token):
     """Display the row of change form object tools."""
     return InclusionAdminNode(
+        "change_form_object_tools",
         parser,
         token,
         func=lambda context: context,
diff --git a/django/contrib/admin/templatetags/base.py b/django/contrib/admin/templatetags/base.py
index 3f8290d3b106..c0474135ea0e 100644
--- a/django/contrib/admin/templatetags/base.py
+++ b/django/contrib/admin/templatetags/base.py
@@ -1,5 +1,6 @@
 from inspect import getfullargspec
 
+from django.template.exceptions import TemplateSyntaxError
 from django.template.library import InclusionNode, parse_bits
 from django.utils.inspect import lazy_annotations
 
@@ -10,12 +11,21 @@ class InclusionAdminNode(InclusionNode):
     or globally.
     """
 
-    def __init__(self, parser, token, func, template_name, takes_context=True):
+    def __init__(self, name, parser, token, func, template_name, takes_context=True):
         self.template_name = template_name
         with lazy_annotations():
             params, varargs, varkw, defaults, kwonly, kwonly_defaults, _ = (
                 getfullargspec(func)
             )
+        if takes_context:
+            if params and params[0] == "context":
+                del params[0]
+            else:
+                function_name = func.__name__
+                raise TemplateSyntaxError(
+                    f"{name!r} sets takes_context=True so {function_name!r} "
+                    "must have a first argument of 'context'"
+                )
         bits = token.split_contents()
         args, kwargs = parse_bits(
             parser,
@@ -26,7 +36,6 @@ def __init__(self, parser, token, func, template_name, takes_context=True):
             defaults,
             kwonly,
             kwonly_defaults,
-            takes_context,
             bits[0],
         )
         super().__init__(func, takes_context, args, kwargs, filename=None)
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index b380fcbb55e5..343e382b0516 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -2842,10 +2842,14 @@ def validate(self, value, model_instance):
         pass
 
     def get_db_prep_value(self, value, connection, prepared=False):
-        if not prepared:
-            value = self.get_prep_value(value)
-            value = connection.ops.validate_autopk_value(value)
-        return value
+        return value if prepared else self.get_prep_value(value)
+
+    def get_db_prep_save(self, value, connection):
+        if hasattr(value, "as_sql"):
+            return value
+        value = self.get_prep_value(value)
+        value = connection.ops.validate_autopk_value(value)
+        return self.get_db_prep_value(value, connection=connection, prepared=True)
 
     def contribute_to_class(self, cls, name, **kwargs):
         if cls._meta.auto_field:
diff --git a/django/template/library.py b/django/template/library.py
index 27af7a696994..0a459c049787 100644
--- a/django/template/library.py
+++ b/django/template/library.py
@@ -123,6 +123,15 @@ def dec(func):
                 ) = getfullargspec(unwrap(func))
             function_name = name or func.__name__
 
+            if takes_context:
+                if params and params[0] == "context":
+                    del params[0]
+                else:
+                    raise TemplateSyntaxError(
+                        f"{function_name!r} is decorated with takes_context=True so it "
+                        "must have a first argument of 'context'"
+                    )
+
             @wraps(func)
             def compile_func(parser, token):
                 bits = token.split_contents()[1:]
@@ -139,7 +148,6 @@ def compile_func(parser, token):
                     defaults,
                     kwonly,
                     kwonly_defaults,
-                    takes_context,
                     function_name,
                 )
                 return SimpleNode(func, takes_context, args, kwargs, target_var)
@@ -182,26 +190,32 @@ def dec(func):
             if end_name is None:
                 end_name = f"end{function_name}"
 
-            @wraps(func)
-            def compile_func(parser, token):
-                tag_params = params.copy()
+            if takes_context:
+                if len(params) >= 2 and params[1] == "content":
+                    del params[1]
+                else:
+                    raise TemplateSyntaxError(
+                        f"{function_name!r} is decorated with takes_context=True so"
+                        " it must have a first argument of 'context' and a second "
+                        "argument of 'content'"
+                    )
 
-                if takes_context:
-                    if len(tag_params) >= 2 and tag_params[1] == "content":
-                        del tag_params[1]
-                    else:
-                        raise TemplateSyntaxError(
-                            f"{function_name!r} is decorated with takes_context=True so"
-                            " it must have a first argument of 'context' and a second "
-                            "argument of 'content'"
-                        )
-                elif tag_params and tag_params[0] == "content":
-                    del tag_params[0]
+                if params and params[0] == "context":
+                    del params[0]
                 else:
                     raise TemplateSyntaxError(
-                        f"'{function_name}' must have a first argument of 'content'"
+                        f"{function_name!r} is decorated with takes_context=True so it "
+                        "must have a first argument of 'context'"
                     )
+            elif params and params[0] == "content":
+                del params[0]
+            else:
+                raise TemplateSyntaxError(
+                    f"{function_name!r} must have a first argument of 'content'"
+                )
 
+            @wraps(func)
+            def compile_func(parser, token):
                 bits = token.split_contents()[1:]
                 target_var = None
                 if len(bits) >= 2 and bits[-2] == "as":
@@ -214,13 +228,12 @@ def compile_func(parser, token):
                 args, kwargs = parse_bits(
                     parser,
                     bits,
-                    tag_params,
+                    params,
                     varargs,
                     varkw,
                     defaults,
                     kwonly,
                     kwonly_defaults,
-                    takes_context,
                     function_name,
                 )
 
@@ -263,6 +276,15 @@ def dec(func):
                 ) = getfullargspec(unwrap(func))
             function_name = name or func.__name__
 
+            if takes_context:
+                if params and params[0] == "context":
+                    params = params[1:]
+                else:
+                    raise TemplateSyntaxError(
+                        f"{function_name!r} is decorated with takes_context=True so it "
+                        "must have a first argument of 'context'"
+                    )
+
             @wraps(func)
             def compile_func(parser, token):
                 bits = token.split_contents()[1:]
@@ -275,7 +297,6 @@ def compile_func(parser, token):
                     defaults,
                     kwonly,
                     kwonly_defaults,
-                    takes_context,
                     function_name,
                 )
                 return InclusionNode(
@@ -394,7 +415,6 @@ def parse_bits(
     defaults,
     kwonly,
     kwonly_defaults,
-    takes_context,
     name,
 ):
     """
@@ -402,14 +422,6 @@ def parse_bits(
     particular by detecting syntax errors and by extracting positional and
     keyword arguments.
     """
-    if takes_context:
-        if params and params[0] == "context":
-            params = params[1:]
-        else:
-            raise TemplateSyntaxError(
-                "'%s' is decorated with takes_context=True so it must "
-                "have a first argument of 'context'" % name
-            )
     args = []
     kwargs = {}
     unhandled_params = list(params)
diff --git a/docs/ref/models/database-functions.txt b/docs/ref/models/database-functions.txt
index c9262eb2447f..42bbb09956b7 100644
--- a/docs/ref/models/database-functions.txt
+++ b/docs/ref/models/database-functions.txt
@@ -1783,10 +1783,10 @@ Usage example:
 ``StrIndex``
 ------------
 
-.. class:: StrIndex(string, substring, **extra)
+.. class:: StrIndex(expression, substring, **extra)
 
 Returns a positive integer corresponding to the 1-indexed position of the first
-occurrence of ``substring`` inside ``string``, or 0 if ``substring`` is not
+occurrence of ``substring`` inside ``expression``, or 0 if ``substring`` is not
 found.
 
 Usage example:
diff --git a/tests/admin_changelist/test_date_hierarchy.py b/tests/admin_changelist/test_date_hierarchy.py
index 94a6a8eb6c60..ca3994166feb 100644
--- a/tests/admin_changelist/test_date_hierarchy.py
+++ b/tests/admin_changelist/test_date_hierarchy.py
@@ -2,7 +2,8 @@
 
 from django.contrib.admin.options import IncorrectLookupParameters
 from django.contrib.auth.models import User
-from django.test import RequestFactory, TestCase
+from django.test import RequestFactory, TestCase, override_settings
+from django.urls import reverse
 from django.utils.timezone import make_aware
 
 from .admin import EventAdmin
@@ -95,3 +96,10 @@ def test_invalid_params(self):
                 self.assertRaises(IncorrectLookupParameters),
             ):
                 self.assertDateParams(invalid_query, None, None)
+
+    @override_settings(ROOT_URLCONF="admin_changelist.urls")
+    def test_label_in_hierarchy(self):
+        self.client.force_login(self.superuser)
+        Event.objects.create(date=datetime(2017, 1, 1))
+        response = self.client.get(reverse("admin:admin_changelist_event_changelist"))
+        self.assertContains(response, "Filter by date", status_code=200)
diff --git a/tests/admin_views/test_templatetags.py b/tests/admin_views/test_templatetags.py
index e8129cce1dfa..69bae2741240 100644
--- a/tests/admin_views/test_templatetags.py
+++ b/tests/admin_views/test_templatetags.py
@@ -144,6 +144,7 @@ def action(arg: SomeType = None):  # NOQA: F821
         # inspect.getfullargspec(), which is not ready for deferred
         # evaluation of annotations.
         InclusionAdminNode(
+            "test",
             parser=object(),
             token=Token(token_type=TokenType.TEXT, contents="a"),
             func=action,
diff --git a/tests/backends/tests.py b/tests/backends/tests.py
index 3e708401c52e..d53cfa513632 100644
--- a/tests/backends/tests.py
+++ b/tests/backends/tests.py
@@ -19,6 +19,7 @@
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.backends.signals import connection_created
 from django.db.backends.utils import CursorWrapper
+from django.db.models import BigAutoField, Value
 from django.db.models.sql.constants import CURSOR
 from django.test import (
     TestCase,
@@ -966,7 +967,7 @@ def test_thread_sharing_count(self):
             connection.dec_thread_sharing()
 
 
-class MySQLPKZeroTests(TestCase):
+class MySQLAutoPKZeroTests(TestCase):
     """
     Zero as id for AutoField should raise exception in MySQL, because MySQL
     does not allow zero for autoincrement primary key if the
@@ -975,8 +976,15 @@ class MySQLPKZeroTests(TestCase):
 
     @skipIfDBFeature("allows_auto_pk_0")
     def test_zero_as_autoval(self):
-        with self.assertRaises(ValueError):
+        msg = "The database backend does not accept 0 as a value for AutoField."
+        with self.assertRaisesMessage(ValueError, msg):
             Square.objects.create(id=0, root=0, square=1)
+        with self.assertRaisesMessage(ValueError, msg):
+            Square.objects.create(id=Value(0, BigAutoField()), root=0, square=1)
+
+    @skipIfDBFeature("allows_auto_pk_0")
+    def test_no_error_when_filtering_with_expression(self):
+        self.assertSequenceEqual(Square.objects.filter(id=Value(0, BigAutoField())), ())
 
 
 class DBConstraintTestCase(TestCase):
diff --git a/tests/template_tests/templatetags/custom.py b/tests/template_tests/templatetags/custom.py
index bf201e74e9d8..f89ed1d9d391 100644
--- a/tests/template_tests/templatetags/custom.py
+++ b/tests/template_tests/templatetags/custom.py
@@ -268,62 +268,6 @@ def simple_unlimited_args_kwargs_block(content, one, two="hi", *args, **kwargs):
     )
 
 
-@register.simple_block_tag(takes_context=True)
-def simple_block_tag_without_context_parameter(arg):
-    """Expected simple_block_tag_without_context_parameter __doc__"""
-    return "Expected result"
-
-
-@register.simple_block_tag
-def simple_tag_without_content_parameter(arg):
-    """Expected simple_tag_without_content_parameter __doc__"""
-    return "Expected result"
-
-
-@register.simple_block_tag(takes_context=True)
-def simple_tag_with_context_without_content_parameter(context, arg):
-    """Expected simple_tag_with_context_without_content_parameter __doc__"""
-    return "Expected result"
-
-
-@register.simple_tag(takes_context=True)
-def simple_tag_without_context_parameter(arg):
-    """Expected simple_tag_without_context_parameter __doc__"""
-    return "Expected result"
-
-
-simple_tag_without_context_parameter.anything = (
-    "Expected simple_tag_without_context_parameter __dict__"
-)
-
-
-@register.simple_block_tag(takes_context=True)
-def simple_tag_takes_context_without_params_block():
-    """Expected simple_tag_takes_context_without_params_block __doc__"""
-    return "Expected result"
-
-
-@register.simple_tag(takes_context=True)
-def simple_tag_takes_context_without_params():
-    """Expected simple_tag_takes_context_without_params __doc__"""
-    return "Expected result"
-
-
-simple_tag_takes_context_without_params.anything = (
-    "Expected simple_tag_takes_context_without_params __dict__"
-)
-
-
-@register.simple_block_tag
-def simple_block_tag_without_content():
-    return "Expected result"
-
-
-@register.simple_block_tag(takes_context=True)
-def simple_block_tag_with_context_without_content():
-    return "Expected result"
-
-
 @register.simple_tag(takes_context=True)
 def escape_naive(context):
     """A tag that doesn't even think about escaping issues"""
diff --git a/tests/template_tests/templatetags/inclusion.py b/tests/template_tests/templatetags/inclusion.py
index ea749a43b5a7..741eb250a2bd 100644
--- a/tests/template_tests/templatetags/inclusion.py
+++ b/tests/template_tests/templatetags/inclusion.py
@@ -269,28 +269,6 @@ def inclusion_unlimited_args_kwargs(one, two="hi", *args, **kwargs):
 )
 
 
-@register.inclusion_tag("inclusion.html", takes_context=True)
-def inclusion_tag_without_context_parameter(arg):
-    """Expected inclusion_tag_without_context_parameter __doc__"""
-    return {}
-
-
-inclusion_tag_without_context_parameter.anything = (
-    "Expected inclusion_tag_without_context_parameter __dict__"
-)
-
-
-@register.inclusion_tag("inclusion.html", takes_context=True)
-def inclusion_tag_takes_context_without_params():
-    """Expected inclusion_tag_takes_context_without_params __doc__"""
-    return {}
-
-
-inclusion_tag_takes_context_without_params.anything = (
-    "Expected inclusion_tag_takes_context_without_params __dict__"
-)
-
-
 @register.inclusion_tag("inclusion_extends1.html")
 def inclusion_extends1():
     return {}
diff --git a/tests/template_tests/test_custom.py b/tests/template_tests/test_custom.py
index 424c11087550..c146da5ff778 100644
--- a/tests/template_tests/test_custom.py
+++ b/tests/template_tests/test_custom.py
@@ -2,7 +2,7 @@
 
 from django.template import Context, Engine, TemplateSyntaxError
 from django.template.base import Node
-from django.template.library import InvalidTemplateLibrary
+from django.template.library import InvalidTemplateLibrary, Library
 from django.test import SimpleTestCase
 from django.test.utils import extend_sys_path
 
@@ -216,10 +216,6 @@ def test_simple_tag_registration(self):
         self.verify_tag(
             custom.simple_unlimited_args_kwargs, "simple_unlimited_args_kwargs"
         )
-        self.verify_tag(
-            custom.simple_tag_without_context_parameter,
-            "simple_tag_without_context_parameter",
-        )
 
     def test_simple_tag_missing_context(self):
         # The 'context' parameter must be present when takes_context is True
@@ -228,9 +224,10 @@ def test_simple_tag_missing_context(self):
             "takes_context=True so it must have a first argument of 'context'"
         )
         with self.assertRaisesMessage(TemplateSyntaxError, msg):
-            self.engine.from_string(
-                "{% load custom %}{% simple_tag_without_context_parameter 123 %}"
-            )
+
+            @Library().simple_tag(takes_context=True)
+            def simple_tag_without_context_parameter(arg):
+                return "Expected result"
 
     def test_simple_tag_missing_context_no_params(self):
         msg = (
@@ -238,9 +235,10 @@ def test_simple_tag_missing_context_no_params(self):
             "takes_context=True so it must have a first argument of 'context'"
         )
         with self.assertRaisesMessage(TemplateSyntaxError, msg):
-            self.engine.from_string(
-                "{% load custom %}{% simple_tag_takes_context_without_params %}"
-            )
+
+            @Library().simple_tag(takes_context=True)
+            def simple_tag_takes_context_without_params():
+                return "Expected result"
 
 
 class SimpleBlockTagTests(TagTestCase):
@@ -423,18 +421,6 @@ def test_simple_block_tag_errors(self):
                 "of: endsimple_one_default_block.",
                 "{% load custom %}{% simple_one_default_block %}Some content",
             ),
-            (
-                "'simple_tag_without_content_parameter' must have a first argument "
-                "of 'content'",
-                "{% load custom %}{% simple_tag_without_content_parameter %}",
-            ),
-            (
-                "'simple_tag_with_context_without_content_parameter' is decorated with "
-                "takes_context=True so it must have a first argument of 'context' and "
-                "a second argument of 'content'",
-                "{% load custom %}"
-                "{% simple_tag_with_context_without_content_parameter %}",
-            ),
         ]
 
         for entry in errors:
@@ -485,10 +471,10 @@ def test_simple_block_tag_missing_context(self):
             "takes_context=True so it must have a first argument of 'context'"
         )
         with self.assertRaisesMessage(TemplateSyntaxError, msg):
-            self.engine.from_string(
-                "{% load custom %}{% simple_block_tag_without_context_parameter 123 %}"
-                "{% endsimple_block_tag_without_context_parameter %}"
-            )
+
+            @Library().simple_block_tag(takes_context=True)
+            def simple_block_tag_without_context_parameter(arg):
+                return "Expected result"
 
     def test_simple_block_tag_missing_context_no_params(self):
         msg = (
@@ -496,10 +482,10 @@ def test_simple_block_tag_missing_context_no_params(self):
             "takes_context=True so it must have a first argument of 'context'"
         )
         with self.assertRaisesMessage(TemplateSyntaxError, msg):
-            self.engine.from_string(
-                "{% load custom %}{% simple_tag_takes_context_without_params_block %}"
-                "{% endsimple_tag_takes_context_without_params_block %}"
-            )
+
+            @Library().simple_block_tag(takes_context=True)
+            def simple_tag_takes_context_without_params_block():
+                return "Expected result"
 
     def test_simple_block_tag_missing_content(self):
         # The 'content' parameter must be present when takes_context is True
@@ -507,10 +493,10 @@ def test_simple_block_tag_missing_content(self):
             "'simple_block_tag_without_content' must have a first argument of 'content'"
         )
         with self.assertRaisesMessage(TemplateSyntaxError, msg):
-            self.engine.from_string(
-                "{% load custom %}{% simple_block_tag_without_content %}"
-                "{% endsimple_block_tag_without_content %}"
-            )
+
+            @Library().simple_block_tag
+            def simple_block_tag_without_content():
+                return "Expected result"
 
     def test_simple_block_tag_with_context_missing_content(self):
         # The 'content' parameter must be present when takes_context is True
@@ -520,10 +506,10 @@ def test_simple_block_tag_with_context_missing_content(self):
             "second argument of 'content'"
         )
         with self.assertRaisesMessage(TemplateSyntaxError, msg):
-            self.engine.from_string(
-                "{% load custom %}{% simple_block_tag_with_context_without_content %}"
-                "{% endsimple_block_tag_with_context_without_content %}"
-            )
+
+            @Library().simple_block_tag(takes_context=True)
+            def simple_block_tag_with_context_without_content():
+                return "Expected result"
 
     def test_simple_block_gets_context(self):
         c = Context({"name": "Jack & Jill"})
@@ -720,9 +706,10 @@ def test_include_tag_missing_context(self):
             "takes_context=True so it must have a first argument of 'context'"
         )
         with self.assertRaisesMessage(TemplateSyntaxError, msg):
-            self.engine.from_string(
-                "{% load inclusion %}{% inclusion_tag_without_context_parameter 123 %}"
-            )
+
+            @Library().inclusion_tag("inclusion.html", takes_context=True)
+            def inclusion_tag_without_context_parameter(arg):
+                return {}
 
     def test_include_tag_missing_context_no_params(self):
         msg = (
@@ -730,9 +717,10 @@ def test_include_tag_missing_context_no_params(self):
             "takes_context=True so it must have a first argument of 'context'"
         )
         with self.assertRaisesMessage(TemplateSyntaxError, msg):
-            self.engine.from_string(
-                "{% load inclusion %}{% inclusion_tag_takes_context_without_params %}"
-            )
+
+            @Library().inclusion_tag("inclusion.html", takes_context=True)
+            def inclusion_tag_takes_context_without_params():
+                return {}
 
     def test_inclusion_tags_from_template(self):
         c = Context({"value": 42})
@@ -822,10 +810,6 @@ def test_inclusion_tag_registration(self):
         self.verify_tag(
             inclusion.inclusion_only_unlimited_args, "inclusion_only_unlimited_args"
         )
-        self.verify_tag(
-            inclusion.inclusion_tag_without_context_parameter,
-            "inclusion_tag_without_context_parameter",
-        )
         self.verify_tag(inclusion.inclusion_tag_use_l10n, "inclusion_tag_use_l10n")
         self.verify_tag(
             inclusion.inclusion_unlimited_args_kwargs, "inclusion_unlimited_args_kwargs"