diff --git a/core/src/main/resources/template/ajax/form-close.ftl b/core/src/main/resources/template/ajax/form-close.ftl
index d83c75eaf..c7724ba4f 100644
--- a/core/src/main/resources/template/ajax/form-close.ftl
+++ b/core/src/main/resources/template/ajax/form-close.ftl
@@ -1,6 +1,6 @@
 
 <#if (parameters.customOnsubmitEnabled?default(false))>
-<script>
+<script type="text/javascript">
 <#-- 
   Enable auto-select of optiontransferselect tag's entries upon containing form's 
   submission.
diff --git a/core/src/main/resources/template/simple/combobox.ftl b/core/src/main/resources/template/simple/combobox.ftl
index e60fbcdfa..4bd15a63c 100644
--- a/core/src/main/resources/template/simple/combobox.ftl
+++ b/core/src/main/resources/template/simple/combobox.ftl
@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
 	function autoPopulate_${parameters.name?html}(targetElement) {
 		<#if parameters.headerKey?exists && parameters.headerValue?exists>
 		if (targetElement.options[targetElement.selectedIndex].value == '${parameters.headerKey?html}') {
diff --git a/core/src/main/resources/template/simple/form-close.ftl b/core/src/main/resources/template/simple/form-close.ftl
index 593c04b7d..1de379da3 100644
--- a/core/src/main/resources/template/simple/form-close.ftl
+++ b/core/src/main/resources/template/simple/form-close.ftl
@@ -1,7 +1,7 @@
 </form>
 
 <#if (parameters.customOnsubmitEnabled?if_exists)>
-<script>
+<script type="text/javascript">
 <#-- 
   Enable auto-select of optiontransferselect tag's entries upon containing form's 
   submission.
diff --git a/core/src/main/resources/template/xhtml/form-close-validate.ftl b/core/src/main/resources/template/xhtml/form-close-validate.ftl
index 2c8da8dc1..f805dadea 100644
--- a/core/src/main/resources/template/xhtml/form-close-validate.ftl
+++ b/core/src/main/resources/template/xhtml/form-close-validate.ftl
@@ -12,7 +12,7 @@ Only the following validators are supported:
 END SNIPPET: supported-validators
 -->
 <#if ((parameters.validate?default(false) == true) && (parameters.performValidation?default(false) == true))>
-<script>
+<script type="text/javascript">
     function validateForm_${parameters.id}() {
         form = document.getElementById("${parameters.id}");
         clearErrorMessages(form);
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
index 18b29df2a..050fa950c 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt
@@ -1,7 +1,7 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
     <td>
-<script>
+<script type="text/javascript">
 	function autoPopulate_foo(targetElement) {
 		targetElement.form.elements['foo'].value=targetElement.options[targetElement.selectedIndex].value;
 	}
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
index 0414510bf..f7cc3b264 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt
@@ -1,7 +1,7 @@
 <tr>
     <td class="tdLabel"><label for="myFavouriteFruit" class="label">My Favourite Fruit:</label></td>
     <td>
-<script>
+<script type="text/javascript">
 	function autoPopulate_myFavouriteFruit(targetElement) {
 		if (targetElement.options[targetElement.selectedIndex].value == '-1') {
 			return;
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
index 0414510bf..f7cc3b264 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt
@@ -1,7 +1,7 @@
 <tr>
     <td class="tdLabel"><label for="myFavouriteFruit" class="label">My Favourite Fruit:</label></td>
     <td>
-<script>
+<script type="text/javascript">
 	function autoPopulate_myFavouriteFruit(targetElement) {
 		if (targetElement.options[targetElement.selectedIndex].value == '-1') {
 			return;
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
index a3024e510..369ed54a5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
@@ -19,7 +19,7 @@
 </form>
 
 
-<script>
+<script type="text/javascript">
 	dojo.require("dojo.event.*");
 	var containingForm = document.getElementById("myAction");
 	dojo.event.connect(containingForm, "onsubmit", 
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
index 5798e1a44..105dbb0ec 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
@@ -19,7 +19,7 @@
 </form>
 
 
-<script>
+<script type="text/javascript">
 	dojo.require("dojo.event.*");
 	var containingForm = document.getElementById("myAction");
 	dojo.event.connect(containingForm, "onsubmit", 
@@ -29,7 +29,7 @@
 			});
 </script>
 
-<script>
+<script type="text/javascript">
     function validateForm_myAction() {
         form = document.getElementById("myAction");
         clearErrorMessages(form);
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
index 13b9a8e5d..219f1c8c2 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
@@ -18,7 +18,7 @@
 </form>
 
 
-<script>
+<script type="text/javascript">
 	dojo.require("dojo.event.*");
 	var containingForm = document.getElementById("myAction");
 	dojo.event.connect(containingForm, "onsubmit",