diff --git a/core/includes/common.inc b/core/includes/common.inc
index 4f78db1..64f98ab 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -4205,9 +4205,7 @@ function drupal_pre_render_scripts($elements) {
     '#type' => 'html_tag',
     '#tag' => 'script',
     '#value' => '',
-    '#attributes' => array(
-      'type' => 'text/javascript',
-    ),
+    '#attributes' => array(),
   );
 
   // Loop through each group.
diff --git a/core/modules/filter/filter.test b/core/modules/filter/filter.test
index 2bafd47..dd15147 100644
--- a/core/modules/filter/filter.test
+++ b/core/modules/filter/filter.test
@@ -1617,15 +1617,15 @@ www.example.com with a newline in comments -->
     $f = _filter_htmlcorrector('<p>دروبال');
     $this->assertEqual($f, '<p>دروبال</p>', t('HTML corrector -- Encoding is correctly kept.'));
 
-    $f = _filter_htmlcorrector('<script type="text/javascript">alert("test")</script>');
-    $this->assertEqual($f, '<script type="text/javascript">
+    $f = _filter_htmlcorrector('<script>alert("test")</script>');
+    $this->assertEqual($f, '<script>
 <!--//--><![CDATA[// ><!--
 alert("test")
 //--><!]]>
 </script>', t('HTML corrector -- CDATA added to script element'));
 
-    $f = _filter_htmlcorrector('<p><script type="text/javascript">alert("test")</script></p>');
-    $this->assertEqual($f, '<p><script type="text/javascript">
+    $f = _filter_htmlcorrector('<p><script>alert("test")</script></p>');
+    $this->assertEqual($f, '<p><script>
 <!--//--><![CDATA[// ><!--
 alert("test")
 //--><!]]>
@@ -1676,12 +1676,12 @@ body {color:red}
       t('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '<!--/*--><![CDATA[/* ><!--*/'))
     );
 
-    $filtered_data = _filter_htmlcorrector('<p><script type="text/javascript">
+    $filtered_data = _filter_htmlcorrector('<p><script>
 <!--//--><![CDATA[// ><!--
   alert("test");
 //--><!]]>
 </script></p>');
-    $this->assertEqual($filtered_data, '<p><script type="text/javascript">
+    $this->assertEqual($filtered_data, '<p><script>
 <!--//--><![CDATA[// ><!--
 
 <!--//--><![CDATA[// ><!--
@@ -1693,12 +1693,12 @@ body {color:red}
       t('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '<!--//--><![CDATA[// ><!--'))
     );
 
-    $filtered_data = _filter_htmlcorrector('<p><script type="text/javascript">
+    $filtered_data = _filter_htmlcorrector('<p><script>
 // <![CDATA[
   alert("test");
 // ]]>
 </script></p>');
-    $this->assertEqual($filtered_data, '<p><script type="text/javascript">
+    $this->assertEqual($filtered_data, '<p><script>
 <!--//--><![CDATA[// ><!--
 
 // <![CDATA[
diff --git a/core/modules/openid/openid.inc b/core/modules/openid/openid.inc
index a0549ee..a137fe9 100644
--- a/core/modules/openid/openid.inc
+++ b/core/modules/openid/openid.inc
@@ -89,7 +89,7 @@ function openid_redirect_http($url, $message) {
  */
 function openid_redirect($url, $message) {
   global $language;
-  
+
   $output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . "\n";
   $output .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . $language->language . '" lang="' . $language->language . '">' . "\n";
   $output .= "<head>\n";
@@ -99,7 +99,7 @@ function openid_redirect($url, $message) {
   $output .= "<body>\n";
   $elements = drupal_get_form('openid_redirect_form', $url, $message);
   $output .= drupal_render($elements);
-  $output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>' . "\n";
+  $output .= '<script>document.getElementById("openid-redirect-form").submit();</script>' . "\n";
   $output .= "</body>\n";
   $output .= "</html>\n";
   print $output;
diff --git a/core/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test
index 8936808..d673800 100644
--- a/core/modules/simpletest/tests/common.test
+++ b/core/modules/simpletest/tests/common.test
@@ -1334,8 +1334,8 @@ class JavaScriptTestCase extends DrupalWebTestCase {
     drupal_add_js('jQuery(function () { });', array('type' => 'inline', 'browsers' => array('IE' => FALSE)));
     $javascript = drupal_get_js();
 
-    $expected_1 = "<!--[if lte IE 8]>\n" . '<script type="text/javascript" src="' . file_create_url('core/misc/collapse.js') . '?' . $default_query_string . '"></script>' . "\n<![endif]-->";
-    $expected_2 = "<!--[if !IE]><!-->\n" . '<script type="text/javascript">' . "\n<!--//--><![CDATA[//><!--\n" . 'jQuery(function () { });' . "\n//--><!]]>\n" . '</script>' . "\n<!--<![endif]-->";
+    $expected_1 = "<!--[if lte IE 8]>\n" . '<script src="' . file_create_url('core/misc/collapse.js') . '?' . $default_query_string . '"></script>' . "\n<![endif]-->";
+    $expected_2 = "<!--[if !IE]><!-->\n" . '<script>' . "\n<!--//--><![CDATA[//><!--\n" . 'jQuery(function () { });' . "\n//--><!]]>\n" . '</script>' . "\n<!--<![endif]-->";
 
     $this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered JavaScript within downlevel-hidden conditional comments.'));
     $this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered JavaScript within downlevel-revealed conditional comments.'));
@@ -1367,10 +1367,10 @@ class JavaScriptTestCase extends DrupalWebTestCase {
     drupal_add_js('core/misc/batch.js', array('every_page' => TRUE));
     $javascript = drupal_get_js();
     $expected = implode("\n", array(
-      '<script type="text/javascript" src="' . file_create_url('core/misc/authorize.js') . '?' . $default_query_string . '"></script>',
-      '<script type="text/javascript" src="' . file_create_url('core/misc/batch.js') . '?' . $default_query_string . '"></script>',
-      '<script type="text/javascript" src="' . file_create_url('core/misc/ajax.js') . '?' . $default_query_string . '"></script>',
-      '<script type="text/javascript" src="' . file_create_url('core/misc/autocomplete.js') . '?' . $default_query_string . '"></script>',
+      '<script src="' . file_create_url('core/misc/authorize.js') . '?' . $default_query_string . '"></script>',
+      '<script src="' . file_create_url('core/misc/batch.js') . '?' . $default_query_string . '"></script>',
+      '<script src="' . file_create_url('core/misc/ajax.js') . '?' . $default_query_string . '"></script>',
+      '<script src="' . file_create_url('core/misc/autocomplete.js') . '?' . $default_query_string . '"></script>',
     ));
     $this->assertTrue(strpos($javascript, $expected) > 0, t('Unaggregated JavaScript is added in the expected group order.'));
 
@@ -1385,8 +1385,8 @@ class JavaScriptTestCase extends DrupalWebTestCase {
     $js_items = drupal_add_js();
     $javascript = drupal_get_js();
     $expected = implode("\n", array(
-      '<script type="text/javascript" src="' . file_create_url(drupal_build_js_cache(array('core/misc/authorize.js' => $js_items['core/misc/authorize.js'], 'core/misc/batch.js' => $js_items['core/misc/batch.js']))) . '"></script>',
-      '<script type="text/javascript" src="' . file_create_url(drupal_build_js_cache(array('core/misc/ajax.js' => $js_items['core/misc/ajax.js'], 'core/misc/autocomplete.js' => $js_items['core/misc/autocomplete.js']))) . '"></script>',
+      '<script src="' . file_create_url(drupal_build_js_cache(array('core/misc/authorize.js' => $js_items['core/misc/authorize.js'], 'core/misc/batch.js' => $js_items['core/misc/batch.js']))) . '"></script>',
+      '<script src="' . file_create_url(drupal_build_js_cache(array('core/misc/ajax.js' => $js_items['core/misc/ajax.js'], 'core/misc/autocomplete.js' => $js_items['core/misc/autocomplete.js']))) . '"></script>',
     ));
     $this->assertTrue(strpos($javascript, $expected) > 0, t('JavaScript is aggregated in the expected groups and order.'));
   }
diff --git a/core/modules/simpletest/tests/mail.test b/core/modules/simpletest/tests/mail.test
index 09dcde6..cf6f6ae 100644
--- a/core/modules/simpletest/tests/mail.test
+++ b/core/modules/simpletest/tests/mail.test
@@ -226,7 +226,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
       // Tests some unsupported HTML tags.
       '<html>Drupal</html>' => "Drupal\n",
       // @todo Perhaps the contents of <script> tags should be dropped.
-      '<script type="text/javascript">Drupal</script>' => "Drupal\n",
+      '<script>Drupal</script>' => "Drupal\n",
     );
 
     foreach ($tests as $html => $text) {
diff --git a/core/modules/system/system.test b/core/modules/system/system.test
index 4e3761d..be2d00b 100644
--- a/core/modules/system/system.test
+++ b/core/modules/system/system.test
@@ -1355,10 +1355,10 @@ class PageTitleFiltering extends DrupalWebTestCase {
    */
   function testTitleXSS() {
     // Set some title with JavaScript and HTML chars to escape.
-    $title = '</title><script type="text/javascript">alert("Title XSS!");</script> & < > " \' ';
+    $title = '</title><script>alert("Title XSS!");</script> & < > " \' ';
     $title_filtered = check_plain($title);
 
-    $slogan = '<script type="text/javascript">alert("Slogan XSS!");</script>';
+    $slogan = '<script>alert("Slogan XSS!");</script>';
     $slogan_filtered = filter_xss_admin($slogan);
 
     // Activate needed appearance settings.
