diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index a57b219150..0061163eeb 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -18,12 +18,24 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 
 		// Prepare correct result
 		$scripts = array(
-			'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>',
-			'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=0"></script>',
+			'<script src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0"></script>',
+			'<script src="' . $this->test_path . '/templates/parent_and_child.js?test=1&amp;assets_version=0"></script>',
+			'<script src="' . $this->test_path . '/templates/parent_and_child.js?test=1;assets_version=0"></script>',
+			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/child_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>',
+			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>',
+			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1;test2=2;assets_version=1#test3"></script>',
+			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?test1=&quot;&amp;assets_version=1#test3"></script>',
+			'<script src="//phpbb.com/b.js"></script>',
+			'<script src="http://phpbb.com/b.js?c=d#f"></script>',
+			'<script src="http://phpbb.com/b.js?c=d&assets_version=1#f"></script>',
+			'<script src="//[1234:d123:a105::123]/test.js"></script>',
 		);
 
 		// Run test
diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html
index 229f1ccc19..dd7b059f12 100644
--- a/tests/template/templates/includejs.html
+++ b/tests/template/templates/includejs.html
@@ -1,8 +1,21 @@
 <!-- INCLUDEJS parent_and_child.js -->
+<!-- INCLUDEJS parent_and_child.js?assets_version=0 -->
+<!-- INCLUDEJS parent_and_child.js?test=1&assets_version=0 -->
+<!-- INCLUDEJS parent_and_child.js?test=1&amp;assets_version=0 -->
+<!-- INCLUDEJS parent_and_child.js?test=1;assets_version=0 -->
 <!-- INCLUDEJS {PARENT} -->
 <!-- DEFINE $TEST = 'child_only.js' -->
 <!-- INCLUDEJS {$TEST} -->
 <!-- INCLUDEJS subdir/{PARENT} -->
 <!-- INCLUDEJS {SUBDIR}/subsubdir/{PARENT} -->
 <!-- INCLUDEJS {SUBDIR}/parent_only.{EXT} -->
-{$SCRIPTS}
+<!-- DEFINE $TEST = 'child_only.js?test1=1&amp;test2=2#test3' -->
+<!-- INCLUDEJS {$TEST} -->
+<!-- INCLUDEJS parent_only.js?test1=1&amp;test2=2#test3 -->
+<!-- INCLUDEJS parent_only.js?test1=1;test2=2#test3 -->
+<!-- INCLUDEJS parent_only.js?test1=&quot;#test3 -->
+<!-- INCLUDEJS //phpbb.com/b.js -->
+<!-- INCLUDEJS http://phpbb.com/b.js?c=d#f -->
+<!-- INCLUDEJS http://phpbb.com/b.js?c=d&assets_version=1#f -->
+<!-- INCLUDEJS //[1234:d123:a105::123]/test.js -->
+{SCRIPTS}