1 files changed, 11 insertions, 0 deletions

diff --git a/tests/template_tests/syntax_tests/test_static.py b/tests/template_tests/syntax_tests/test_static.py
index 8ff90f5a5c..0cbe23a65a 100644
--- a/tests/template_tests/syntax_tests/test_static.py
+++ b/tests/template_tests/syntax_tests/test_static.py
@@ -50,3 +50,14 @@ class StaticTagTests(SimpleTestCase):
     def test_static_statictag04(self):
         output = self.engine.render_to_string('static-statictag04', {'base_css': 'admin/base.css'})
         self.assertEqual(output, urljoin(settings.STATIC_URL, 'admin/base.css'))
+
+    @setup({'static-statictag05': '{% load static %}{% static "test.html?foo=1&bar=2" %}'})
+    def test_static_escapes_urls(self):
+        output = self.engine.render_to_string('static-statictag05')
+        self.assertEqual(output, urljoin(settings.STATIC_URL, '/static/test.html?foo=1&bar=2'))
+
+    @setup({'static-statictag06': '{% load static %}'
+                                  '{% autoescape off %}{% static "test.html?foo=1&bar=2" %}{% endautoescape %}'})
+    def test_static_escapes_urls_autoescape_off(self):
+        output = self.engine.render_to_string('static-statictag06')
+        self.assertEqual(output, urljoin(settings.STATIC_URL, '/static/test.html?foo=1&bar=2'))