diff --git a/wagtail/tests/templates/tests/event_page.html b/wagtail/tests/templates/tests/event_page.html
index b60bc60588..795b7bf0a7 100644
--- a/wagtail/tests/templates/tests/event_page.html
+++ b/wagtail/tests/templates/tests/event_page.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
diff --git a/wagtail/tests/templates/tests/form_page.html b/wagtail/tests/templates/tests/form_page.html
index 5fbd2ae9f2..d908c60a27 100644
--- a/wagtail/tests/templates/tests/form_page.html
+++ b/wagtail/tests/templates/tests/form_page.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
diff --git a/wagtail/tests/templates/tests/form_page_landing.html b/wagtail/tests/templates/tests/form_page_landing.html
index e29a6a942f..d9a6369d47 100644
--- a/wagtail/tests/templates/tests/form_page_landing.html
+++ b/wagtail/tests/templates/tests/form_page_landing.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
diff --git a/wagtail/tests/templates/tests/includes/event_listing.html b/wagtail/tests/templates/tests/includes/event_listing.html
index 31c0b1b3ba..02f880ec4e 100644
--- a/wagtail/tests/templates/tests/includes/event_listing.html
+++ b/wagtail/tests/templates/tests/includes/event_listing.html
@@ -1,4 +1,4 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
 
 <ul>
     {% for event in events %}
diff --git a/wagtail/tests/templates/tests/simple_page.html b/wagtail/tests/templates/tests/simple_page.html
index 3413b3aa27..1f35935147 100644
--- a/wagtail/tests/templates/tests/simple_page.html
+++ b/wagtail/tests/templates/tests/simple_page.html
@@ -1,4 +1,5 @@
-{% load pageurl %}
+{% load wagtailcore_tags %}
+
 <!DOCTYPE HTML>
 <html>
     <head>
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
index c4466d8976..f9a221bb33 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
@@ -1,6 +1,6 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% block titletag %}{% trans "Add a document" %}{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block extra_css %}
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
index d27f16155c..55734fbbd9 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
@@ -1,6 +1,6 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% block titletag %}{% blocktrans with title=document.title %}Editing {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-documents{% endblock %}
 {% block extra_css %}
diff --git a/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html b/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
index b914f9c6b1..fbc28c425c 100644
--- a/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
+++ b/wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
@@ -1,4 +1,4 @@
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% trans "Insert embed" as ins_emb_str %}
 {% include "wagtailadmin/shared/header.html" with title=ins_emb_str merged=1 %}
diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py
index e7d040aa69..4055669819 100644
--- a/wagtail/wagtailembeds/tests.py
+++ b/wagtail/wagtailembeds/tests.py
@@ -19,8 +19,7 @@ from wagtail.wagtailembeds.embeds import (
     AccessDeniedEmbedlyException,
 )
 from wagtail.wagtailembeds.embeds import embedly as wagtail_embedly, oembed as wagtail_oembed
-from wagtail.wagtailembeds.templatetags.embed_filters import embed as embed_filter
-from wagtail.wagtailembeds.templatetags.embed_filters import embedly as embedly_filter
+from wagtail.wagtailembeds.templatetags.wagtailembeds_tags import embed as embed_filter, embedly as embedly_filter
 
 
 class TestEmbeds(TestCase):
@@ -284,7 +283,7 @@ class TestEmbedFilter(TestCase):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'photo',
                               'url': 'http://www.example.com'}
-        temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embed }}')
+        temp = template.Template('{% load wagtailembeds_tags %}{{ "http://www.youtube.com/watch/"|embed }}')
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '<img src="http://www.example.com" />')
@@ -295,7 +294,7 @@ class TestEmbedFilter(TestCase):
         urlopen.return_value = self.dummy_response
         loads.return_value = {'type': 'foo',
                               'url': 'http://www.example.com'}
-        temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embed }}')
+        temp = template.Template('{% load wagtailembeds_tags %}{{ "http://www.youtube.com/watch/"|embed }}')
         context = template.Context()
         result = temp.render(context)
         self.assertEqual(result, '')
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
index 1fcadb3f99..984f690101 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
@@ -1,4 +1,4 @@
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% trans "Choose an image" as choose_str %}
 {% include "wagtailadmin/shared/header.html" with title=choose_str merged=1 tabbed=1 icon="image" %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html
index d445317912..497211f26d 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html
@@ -1,4 +1,4 @@
-{% load image_tags wagtailadmin_tags %}
+{% load wagtailimages_tags wagtailadmin_tags %}
 {% load i18n %}
 {% if images %}
     {% if is_searching %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
index 79eab3f834..6aed9d005f 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
@@ -1,4 +1,4 @@
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% trans "Choose a format" as choose_str %}
 {% include "wagtailadmin/shared/header.html" with title=choose_str %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html b/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html
index d12f075f96..abae4c9058 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/edit_handlers/chooser_panel.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 
 {% block chooser_class %}image-chooser{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/add.html b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
index 12f98b1bd3..33c477fb44 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/add.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/add.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Add an image" %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html b/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
index 0b6d6618f0..ac9915dc8f 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Delete image" %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index a1574527ee..f75b4e56e8 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-images{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/index.html b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
index 9e8d012b82..ba7465895f 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/index.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/index.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 
 {% block titletag %}{% trans "Images" %}{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/results.html b/wagtail/wagtailimages/templates/wagtailimages/images/results.html
index 006d3cd696..60380a7d86 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/results.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/results.html
@@ -1,4 +1,4 @@
-{% load image_tags wagtailadmin_tags %}
+{% load wagtailimages_tags wagtailadmin_tags %}
 {% load i18n %}
 {% if images %}
     {% if is_searching %}
diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py
index 91ed2df6a7..5b7b2fd142 100644
--- a/wagtail/wagtailimages/tests.py
+++ b/wagtail/wagtailimages/tests.py
@@ -191,7 +191,7 @@ class TestImageTag(TestCase):
         )
 
     def render_image_tag(self, image, filter_spec):
-        temp = template.Template('{% load image_tags %}{% image image_obj ' + filter_spec + '%}')
+        temp = template.Template('{% load wagtailimages_tags %}{% image image_obj ' + filter_spec + '%}')
         context = template.Context({'image_obj': image})
         return temp.render(context)
 
@@ -204,7 +204,7 @@ class TestImageTag(TestCase):
         self.assertTrue('alt="Test image"' in result)
 
     def render_image_tag_as(self, image, filter_spec):
-        temp = template.Template('{% load image_tags %}{% image image_obj ' + filter_spec + ' as test_img %}<img {{ test_img.attrs }} />')
+        temp = template.Template('{% load wagtailimages_tags %}{% image image_obj ' + filter_spec + ' as test_img %}<img {{ test_img.attrs }} />')
         context = template.Context({'image_obj': image})
         return temp.render(context)
 
@@ -217,7 +217,7 @@ class TestImageTag(TestCase):
         self.assertTrue('alt="Test image"' in result)
 
     def render_image_tag_with_extra_attributes(self, image, title):
-        temp = template.Template('{% load image_tags %}{% image image_obj width-400 class="photo" title=title|lower %}')
+        temp = template.Template('{% load wagtailimages_tags %}{% image image_obj width-400 class="photo" title=title|lower %}')
         context = template.Context({'image_obj': image, 'title': title})
         return temp.render(context)
 
diff --git a/wagtail/wagtailusers/templates/wagtailusers/create.html b/wagtail/wagtailusers/templates/wagtailusers/create.html
index e2f5150c88..91cba6846a 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/create.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Add user" %}{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/edit.html b/wagtail/wagtailusers/templates/wagtailusers/edit.html
index c6c43ce6dd..1f0cc384fb 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/edit.html
@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load image_tags %}
+{% load wagtailimages_tags %}
 {% load i18n %}
 {% block titletag %}{% trans "Editing" %} {{ user.username}}{% endblock %}
 {% block bodyclass %}menu-users{% endblock %}
