diff --git a/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html b/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html
index f1be0439df3670..8202a892a34908 100644
--- a/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html
+++ b/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_2.html
@@ -6,7 +6,7 @@
 <pre id="step_log"></pre>
 <iframe id="test"></iframe>
 <script>
-var t = async_test(undefined, {timeout:10000});
+var t = async_test();
 var f = document.getElementById("test");
 var l = document.getElementById("step_log");
 
diff --git a/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html b/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html
index 88b05789de48f4..b6a35680dd7163 100644
--- a/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html
+++ b/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin_3.html
@@ -6,7 +6,7 @@
 <pre id="step_log"></pre>
 <iframe id="test"></iframe>
 <script>
-var t = async_test(undefined, {timeout:10000});
+var t = async_test();
 var f = document.getElementById("test");
 var l = document.getElementById("step_log");
 
diff --git a/html/browsers/browsing-the-web/navigating-across-documents/010.html b/html/browsers/browsing-the-web/navigating-across-documents/010.html
index 3917cd16e5578d..f1749decc69048 100644
--- a/html/browsers/browsing-the-web/navigating-across-documents/010.html
+++ b/html/browsers/browsing-the-web/navigating-across-documents/010.html
@@ -7,7 +7,7 @@
 <form target="test" action="javascript:(function() {var x = new XMLHttpRequest(); x.open('GET', 'blank.html?pipe=trickle(d2)', false); x.send(); document.write('<script>parent.postMessage(&quot;write&quot;, &quot;*&quot;)</script>'); return '<script>parent.postMessage(&quot;click&quot;, &quot;*&quot;)</script>'})()"></form>
 <a target="test" onclick="document.forms[0].submit()" href="href.html">Test</a>
 <script>
-var t = async_test(undefined, {timeout:4000});
+var t = async_test();
 t.step(function() {document.getElementsByTagName("a")[0].click()});
 onmessage = t.step_func(
   function(e) {
diff --git a/html/browsers/browsing-the-web/navigating-across-documents/012.html b/html/browsers/browsing-the-web/navigating-across-documents/012.html
index be8f2feba8244a..3795975d702b83 100644
--- a/html/browsers/browsing-the-web/navigating-across-documents/012.html
+++ b/html/browsers/browsing-the-web/navigating-across-documents/012.html
@@ -10,7 +10,7 @@
      javascript url involved here, unlike what the title claims! -->
 <a target="test" onclick="javascript:(function() {var x = new XMLHttpRequest(); x.open('GET', 'blank.html?pipe=trickle(d2)', false); x.send(); document.write('write<script>parent.postMessage(&quot;write&quot;, &quot;*&quot;)</script>'); return '<script>parent.postMessage(&quot;click&quot;, &quot;*&quot;)</script>'})()" href="href.html">Test</a>
 <script>
-var t = async_test(undefined, {timeout:4000});
+var t = async_test();
 t.step(function() {document.getElementsByTagName("a")[0].click()});
 onmessage = t.step_func(
   function(e) {
diff --git a/html/browsers/browsing-the-web/navigating-across-documents/013.html b/html/browsers/browsing-the-web/navigating-across-documents/013.html
index 69ce7bc6168a9a..36a45218431975 100644
--- a/html/browsers/browsing-the-web/navigating-across-documents/013.html
+++ b/html/browsers/browsing-the-web/navigating-across-documents/013.html
@@ -6,7 +6,7 @@
 <iframe id="test" name="test"></iframe>
 <a target="test" href="javascript:parent.events.push('javascript');">Test</a>
 <script>
-var t = async_test(undefined, {timeout:4000});
+var t = async_test();
 var events = [];
 t.step(function() {
   document.getElementsByTagName("a")[0].click();
diff --git a/html/browsers/browsing-the-web/navigating-across-documents/014.html b/html/browsers/browsing-the-web/navigating-across-documents/014.html
index 605e181858d4c7..b27ca992bd715f 100644
--- a/html/browsers/browsing-the-web/navigating-across-documents/014.html
+++ b/html/browsers/browsing-the-web/navigating-across-documents/014.html
@@ -7,7 +7,7 @@
 <form target="test" action="javascript:parent.events.push('submit');"></form>
 <a target="test" onclick="document.forms[0].submit()">Test</a>
 <script>
-var t = async_test(undefined, {timeout:4000});
+var t = async_test();
 var events = [];
 t.step(function() {
   document.getElementsByTagName("a")[0].click();
diff --git a/html/browsers/browsing-the-web/navigating-across-documents/015.html b/html/browsers/browsing-the-web/navigating-across-documents/015.html
index eb54622b785ea1..696aaec2c8311d 100644
--- a/html/browsers/browsing-the-web/navigating-across-documents/015.html
+++ b/html/browsers/browsing-the-web/navigating-across-documents/015.html
@@ -6,7 +6,7 @@
 <iframe id="test" name="test"></iframe>
 <a target="test" onclick="parent.events.push('click');" href="javascript:parent.events.push('href')">Test</a>
 <script>
-var t = async_test(undefined, {timeout:4000});
+var t = async_test();
 var events = [];
 t.step(function() {
   document.getElementsByTagName("a")[0].click();
diff --git a/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-query-fragment-components.html b/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-query-fragment-components.html
index 9c18f109cd50e4..eced9646e5a8e5 100644
--- a/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-query-fragment-components.html
+++ b/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-query-fragment-components.html
@@ -13,7 +13,7 @@
 <iframe id="c" src='javascript:"%252525 ? %252525 # %252525"'></iframe>
 
 <script>
-var t = async_test("iframes with javascript src", {timeout:1000});
+var t = async_test("iframes with javascript src");
 function check(id, expected) {
   assert_equals(
     document.getElementById(id).contentDocument.body.textContent,
diff --git a/html/browsers/history/the-history-interface/history_back_1.html b/html/browsers/history/the-history-interface/history_back_1.html
index cc37ddd35d8f76..8ccf205956957a 100644
--- a/html/browsers/history/the-history-interface/history_back_1.html
+++ b/html/browsers/history/the-history-interface/history_back_1.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/history_forward_1.html b/html/browsers/history/the-history-interface/history_forward_1.html
index 3d119482c9f1d2..220495c7f609c8 100644
--- a/html/browsers/history/the-history-interface/history_forward_1.html
+++ b/html/browsers/history/the-history-interface/history_forward_1.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/history_go_no_argument.html b/html/browsers/history/the-history-interface/history_go_no_argument.html
index 278cf86c2ea151..68aeab202753e3 100644
--- a/html/browsers/history/the-history-interface/history_go_no_argument.html
+++ b/html/browsers/history/the-history-interface/history_go_no_argument.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   gone = false;
   pages = []
diff --git a/html/browsers/history/the-history-interface/history_go_to_uri.html b/html/browsers/history/the-history-interface/history_go_to_uri.html
index 6b5ebf1bffab74..43d4a6b0019bb7 100644
--- a/html/browsers/history/the-history-interface/history_go_to_uri.html
+++ b/html/browsers/history/the-history-interface/history_go_to_uri.html
@@ -7,7 +7,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   gone = false;
   pages = []
diff --git a/html/browsers/history/the-history-interface/history_go_undefined.html b/html/browsers/history/the-history-interface/history_go_undefined.html
index e2a40275ee4327..ddb0c858c2b9a0 100644
--- a/html/browsers/history/the-history-interface/history_go_undefined.html
+++ b/html/browsers/history/the-history-interface/history_go_undefined.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/history_go_zero.html b/html/browsers/history/the-history-interface/history_go_zero.html
index 6858783833eb02..88750921b02251 100644
--- a/html/browsers/history/the-history-interface/history_go_zero.html
+++ b/html/browsers/history/the-history-interface/history_go_zero.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   gone = false;
   pages = []
diff --git a/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html b/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html
index b1d0aed52c7587..587cdfb1242463 100644
--- a/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html
+++ b/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
   setup({timeout:3600000});
-  var t = async_test(undefined, {timeout:3600000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html b/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html
index d45a2afb1684aa..94b66f8b559e8a 100644
--- a/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html
+++ b/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_2-manual.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
   setup({timeout:3600000});
-  var t = async_test(undefined, {timeout:3600000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-manual.html b/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-manual.html
index 8154e8e4724ce6..7f96a39240edc5 100644
--- a/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-manual.html
+++ b/html/browsers/history/the-history-interface/non-automated/traverse_the_session_history_unload_prompt_1-manual.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/traverse_the_history_3.html b/html/browsers/history/the-history-interface/traverse_the_history_3.html
index 51ed4eb399be9e..1d10033808c4b4 100644
--- a/html/browsers/history/the-history-interface/traverse_the_history_3.html
+++ b/html/browsers/history/the-history-interface/traverse_the_history_3.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/traverse_the_history_4.html b/html/browsers/history/the-history-interface/traverse_the_history_4.html
index 651693011ae5bf..2856bf8d7374af 100644
--- a/html/browsers/history/the-history-interface/traverse_the_history_4.html
+++ b/html/browsers/history/the-history-interface/traverse_the_history_4.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/traverse_the_history_5.html b/html/browsers/history/the-history-interface/traverse_the_history_5.html
index 837f265b508384..8725497b50146c 100644
--- a/html/browsers/history/the-history-interface/traverse_the_history_5.html
+++ b/html/browsers/history/the-history-interface/traverse_the_history_5.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html b/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html
index 5a72dd6350b8e7..b8215b29f3bb69 100644
--- a/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html
+++ b/html/browsers/history/the-history-interface/traverse_the_history_unload_1.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:5000});
+  var t = async_test();
   started = false;
   pages = []
   timer = null;
diff --git a/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html b/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html
index 4f2555c5eb5066..45a0e3e2fd2927 100644
--- a/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html
+++ b/html/browsers/history/the-location-interface/non-automated/manual_click_assign_during_load-manual.html
@@ -6,7 +6,7 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000});
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var win = window.open("manual_click_assign_during_load-1.html");
 
 var history_length;
diff --git a/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html b/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html
index 43af1b1d3b8f29..a453de34bf91de 100644
--- a/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html
+++ b/html/browsers/history/the-location-interface/non-automated/manual_click_location_replace_during_load-manual.html
@@ -6,7 +6,7 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000});
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var win = window.open("manual_click_location_replace_during_load-1.html");
 
 var history_length;
diff --git a/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load-manual.html b/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load-manual.html
index 3507222caf7d69..482858bcd7b2d1 100644
--- a/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load-manual.html
+++ b/html/browsers/history/the-location-interface/non-automated/manual_click_replace_during_load-manual.html
@@ -6,7 +6,7 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000});
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var win = window.open("manual_click_replace_during_load-1.html");
 
 var history_length;
diff --git a/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html b/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html
index df6487407d99f3..d71b206ac5b237 100644
--- a/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html
+++ b/html/browsers/history/the-location-interface/non-automated/manual_form_submit_assign_during_load-manual.html
@@ -6,7 +6,7 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000});
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var win = window.open("manual_form_submit_assign_during_load-1.html");
 
 var history_length;
diff --git a/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html b/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html
index 1991cee8a1673e..5cb3fac9646756 100644
--- a/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html
+++ b/html/browsers/history/the-location-interface/non-automated/reload_in_resize-manual.html
@@ -6,7 +6,7 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000})
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var load_count = 0;
 var resized = false;
 var win = window.open("reload_in_resize-1.html")
diff --git a/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html b/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html
index 4d7352f4cfd6b5..7ccc6cdc09eac9 100644
--- a/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html
+++ b/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html
@@ -6,7 +6,7 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000});
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var win = window.open("scripted_click_assign_during_load-1.html");
 
 var history_length;
diff --git a/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html b/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html
index 981b9c9a36cf09..2a6eba63abf533 100644
--- a/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html
+++ b/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html
@@ -6,7 +6,7 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000});
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var win = window.open("scripted_form_submit_assign_during_load-1.html");
 
 var history_length;
diff --git a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer.html b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer.html
index 874f5be9da396c..1217882b16f84f 100644
--- a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer.html
+++ b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-var t = async_test(undefined, {timeout:4000});
+var t = async_test();
 t.step(function() {
   var w = window.open("close_script_defer-1.html");
   w.document.open()
diff --git a/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html b/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html
index 3046f854f207c3..38dbdbd0fa1cd4 100644
--- a/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html
+++ b/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html
@@ -4,6 +4,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-var t = async_test(undefined);
+var t = async_test();
 var w = window.open("discard_iframe_history_3-1.html");
 </script>
diff --git a/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html b/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html
index d69d7d7a82380c..ca9dd91f2e16a6 100644
--- a/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html
+++ b/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-manual.html
@@ -5,6 +5,6 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000})
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var w = window.open("discard_iframe_history_1-1.html");
 </script>
diff --git a/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html b/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html
index 27d395d22c46bd..57eaabcd0cea1d 100644
--- a/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html
+++ b/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-manual.html
@@ -5,6 +5,6 @@
 <div id="log"></div>
 <script>
 setup({timeout:3600000})
-var t = async_test(undefined, {timeout:3600000});
+var t = async_test();
 var w = window.open("discard_iframe_history_2-1.html");
 </script>
diff --git a/html/interaction/focus/focus-01.html b/html/interaction/focus/focus-01.html
index 9d1bf1b6c7d3f3..b3696e9794ed29 100644
--- a/html/interaction/focus/focus-01.html
+++ b/html/interaction/focus/focus-01.html
@@ -21,7 +21,7 @@
 setup(function () {
   testEle = document.getElementById("test");
   testEle.focus();
-}, {timeout: 10000});
+});
 
 document.onkeydown = t1.step_func_done(function(evt){
   assert_equals(evt.target, testEle, "The keydown events must be targeted at the input element.");
diff --git a/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html b/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html
index 45429cc1a72c65..eadd95aac52763 100644
--- a/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html
+++ b/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html
@@ -31,7 +31,7 @@
 
 setup(function () {
   document.body.focus();
-}, {timeout: 20000});
+});
 
 
 
diff --git a/html/semantics/embedded-content/media-elements/event_canplay.html b/html/semantics/embedded-content/media-elements/event_canplay.html
index e79c5d1c76dc09..e5c632bc17bb8d 100644
--- a/html/semantics/embedded-content/media-elements/event_canplay.html
+++ b/html/semantics/embedded-content/media-elements/event_canplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger canplay event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger canplay event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("canplay", t.step_func(function() {
@@ -26,7 +26,7 @@
 }, "audio events - canplay");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger canplay event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger canplay event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("canplay", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html b/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
index 811f220d0ddee8..b43f8d052ab77b 100644
--- a/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function () {
-  var t = async_test("setting src attribute on non-autoplay audio should trigger canplay event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay audio should trigger canplay event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("canplay", t.step_func_done(), false);
@@ -23,7 +23,7 @@
 }, "audio events - canplay");
 
 test(function () {
-  var t = async_test("setting src attribute on non-autoplay video should trigger canplay event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay video should trigger canplay event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("canplay", t.step_func_done(), false);
diff --git a/html/semantics/embedded-content/media-elements/event_canplaythrough.html b/html/semantics/embedded-content/media-elements/event_canplaythrough.html
index 9c5a7625d82ddf..b0895a97c281bc 100644
--- a/html/semantics/embedded-content/media-elements/event_canplaythrough.html
+++ b/html/semantics/embedded-content/media-elements/event_canplaythrough.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger canplaythrough event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger canplaythrough event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("canplaythrough", t.step_func(function() {
@@ -26,7 +26,7 @@
 }, "audio events - canplaythrough");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger canplaythrough event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger canplaythrough event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("canplaythrough", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html b/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
index 8384c01da50bff..195b464f012834 100644
--- a/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay audio should trigger canplaythrough event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay audio should trigger canplaythrough event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("canplaythrough", t.step_func_done(), false);
@@ -23,7 +23,7 @@
 }, "audio events - canplaythrough");
 
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay video should trigger canplaythrough event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay video should trigger canplaythrough event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("canplaythrough", t.step_func_done(), false);
diff --git a/html/semantics/embedded-content/media-elements/event_loadeddata.html b/html/semantics/embedded-content/media-elements/event_loadeddata.html
index 281719af021b74..f502c595e67e60 100644
--- a/html/semantics/embedded-content/media-elements/event_loadeddata.html
+++ b/html/semantics/embedded-content/media-elements/event_loadeddata.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger loadeddata event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger loadeddata event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("loadeddata", t.step_func(function() {
@@ -26,7 +26,7 @@
 }, "audio events - loadeddata");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger loadeddata event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger loadeddata event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("loadeddata", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html b/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html
index cc40a147940efb..08b2f2f86e210c 100644
--- a/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay audio should trigger loadeddata event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay audio should trigger loadeddata event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("loadeddata", t.step_func_done(), false);
@@ -23,7 +23,7 @@
 }, "audio events - loadeddata");
 
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay video should trigger loadeddata event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay video should trigger loadeddata event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("loadeddata", t.step_func_done(), false);
diff --git a/html/semantics/embedded-content/media-elements/event_loadedmetadata.html b/html/semantics/embedded-content/media-elements/event_loadedmetadata.html
index c7e9c93e213086..5a0731e811e6d7 100644
--- a/html/semantics/embedded-content/media-elements/event_loadedmetadata.html
+++ b/html/semantics/embedded-content/media-elements/event_loadedmetadata.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger loadedmetadata event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger loadedmetadata event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("loadedmetadata", t.step_func(function() {
@@ -26,7 +26,7 @@
 }, "audio events - loadedmetadata");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger loadedmetadata event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger loadedmetadata event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("loadedmetadata", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html b/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html
index 95ec10d3c65976..b460317f8c5d8f 100644
--- a/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay audio should trigger loadedmetadata event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay audio should trigger loadedmetadata event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("loadedmetadata", t.step_func_done(), false);
@@ -23,7 +23,7 @@
 }, "audio events - loadedmetadata");
 
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay video should trigger loadedmetadata event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay video should trigger loadedmetadata event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("loadedmetadata", t.step_func_done(), false);
diff --git a/html/semantics/embedded-content/media-elements/event_loadstart.html b/html/semantics/embedded-content/media-elements/event_loadstart.html
index de45682125c3ce..192821a961a5a3 100644
--- a/html/semantics/embedded-content/media-elements/event_loadstart.html
+++ b/html/semantics/embedded-content/media-elements/event_loadstart.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger loadstart event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger loadstart event");
   var a = document.getElementById("a");
   a.addEventListener("loadstart", function() {
     t.done();
@@ -25,7 +25,7 @@
 }, "audio events - loadstart");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger loadstart event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger loadstart event");
   var v = document.getElementById("v");
   v.addEventListener("loadstart", function() {
     t.done();
diff --git a/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html b/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html
index b575e7ac87c056..10af32afcbc1d5 100644
--- a/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay audio should trigger loadstart event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay audio should trigger loadstart event");
   var a = document.getElementById("a");
   a.addEventListener("loadstart", function() {
     t.done();
@@ -24,7 +24,7 @@
 }, "audio events - loadstart");
 
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay video should trigger loadstart event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay video should trigger loadstart event");
   var v = document.getElementById("v");
   v.addEventListener("loadstart", function() {
     t.done();
diff --git a/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html b/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html
index ceaa9aaa7ed8f8..e1bae90ed0e629 100644
--- a/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html
+++ b/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger canplay then canplaythrough event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger canplay then canplaythrough event");
   var a = document.getElementById("a");
   var found_canplay = false;
   a.addEventListener("error", t.unreached_func());
@@ -31,7 +31,7 @@
 }, "audio events - canplay, then canplaythrough");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger canplay then canplaythrough event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger canplay then canplaythrough event");
   var v = document.getElementById("v");
   var found_canplay = false;
   v.addEventListener("error", t.unreached_func());
diff --git a/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html b/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html
index e498f58cec43b1..3571e5151ca41f 100644
--- a/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html
+++ b/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger canplay then playing event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger canplay then playing event");
   var a = document.getElementById("a");
   var found_canplay = false;
   a.addEventListener("error", t.unreached_func());
@@ -31,7 +31,7 @@
 }, "audio events - canplay, then playing");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger canplay then playing event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger canplay then playing event");
   var v = document.getElementById("v");
   var found_canplay = false;
   v.addEventListener("error", t.unreached_func());
diff --git a/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html b/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html
index 4c0054c241dc48..71aeca50c137c6 100644
--- a/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html
+++ b/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event");
   var a = document.getElementById("a");
   var found_loadedmetadata = false;
   a.addEventListener("error", t.unreached_func());
@@ -31,7 +31,7 @@
 }, "audio events - loadedmetadata, then loadeddata");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger loadedmetadata then loadeddata event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger loadedmetadata then loadeddata event");
   var v = document.getElementById("v");
   var found_loadedmetadata = false;
   v.addEventListener("error", t.unreached_func());
diff --git a/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html b/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html
index 889336f9d92940..c6e1dbe07a0e32 100644
--- a/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html
+++ b/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger loadstart then progress event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger loadstart then progress event");
   var a = document.getElementById("a");
   var found_loadstart = false;
   a.addEventListener("error", t.unreached_func());
@@ -31,7 +31,7 @@
 }, "audio events - loadstart, then progress");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger loadstart then progress event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger loadstart then progress event");
   var v = document.getElementById("v");
   var found_loadstart = false;
   v.addEventListener("error", t.unreached_func());
diff --git a/html/semantics/embedded-content/media-elements/event_pause.html b/html/semantics/embedded-content/media-elements/event_pause.html
index 7a5d171c84f603..841e124d5b9e6e 100644
--- a/html/semantics/embedded-content/media-elements/event_pause.html
+++ b/html/semantics/embedded-content/media-elements/event_pause.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("calling pause() on autoplay audio should trigger pause event", {timeout:5000});
+  var t = async_test("calling pause() on autoplay audio should trigger pause event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("pause", t.step_func_done(), false);
@@ -26,7 +26,7 @@
 }, "audio events - pause");
 
 test(function() {
-  var t = async_test("calling pause() on autoplay video should trigger pause event", {timeout:5000});
+  var t = async_test("calling pause() on autoplay video should trigger pause event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("pause", t.step_func_done(), false);
diff --git a/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html b/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html
index 8b985a65fe3723..6fe5b2771d9981 100644
--- a/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 promise_test(function(t) {
-  var async_t = async_test("calling play() then pause() on non-autoplay audio should trigger pause event", {timeout:5000});
+  var async_t = async_test("calling play() then pause() on non-autoplay audio should trigger pause event");
   var a = document.getElementById("a");
   a.addEventListener("pause", function() {
     async_t.done();
@@ -27,7 +27,7 @@
 }, "audio events - pause");
 
 promise_test(function(t) {
-  var async_t = async_test("calling play() then pause() on non-autoplay video should trigger pause event", {timeout:5000});
+  var async_t = async_test("calling play() then pause() on non-autoplay video should trigger pause event");
   var v = document.getElementById("v");
   v.addEventListener("pause", function() {
     async_t.done();
diff --git a/html/semantics/embedded-content/media-elements/event_play.html b/html/semantics/embedded-content/media-elements/event_play.html
index acc7f81a85839b..f96c35113b5243 100644
--- a/html/semantics/embedded-content/media-elements/event_play.html
+++ b/html/semantics/embedded-content/media-elements/event_play.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger play event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger play event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("play", t.step_func(function() {
@@ -26,7 +26,7 @@
 }, "audio events - play");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger play event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger play event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("play", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/event_play_noautoplay.html b/html/semantics/embedded-content/media-elements/event_play_noautoplay.html
index 94fcb837d04c0f..45b6d33f824c12 100644
--- a/html/semantics/embedded-content/media-elements/event_play_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_play_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 promise_test(function(t) {
-  var async_t = async_test("calling play() on audio should trigger play event", {timeout:5000});
+  var async_t = async_test("calling play() on audio should trigger play event");
   var a = document.getElementById("a");
   a.addEventListener("play", async_t.step_func(function() {
     a.pause();
@@ -26,7 +26,7 @@
 }, "audio events - play");
 
 promise_test(function(t) {
-  var async_t = async_test("calling play() on video should trigger play event", {timeout:5000});
+  var async_t = async_test("calling play() on video should trigger play event");
   var v = document.getElementById("v");
   v.addEventListener("play", async_t.step_func(function() {
     v.pause();
diff --git a/html/semantics/embedded-content/media-elements/event_playing.html b/html/semantics/embedded-content/media-elements/event_playing.html
index e652607ef392e0..18204c457a8726 100644
--- a/html/semantics/embedded-content/media-elements/event_playing.html
+++ b/html/semantics/embedded-content/media-elements/event_playing.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger playing event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger playing event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("playing", t.step_func(function() {
@@ -26,7 +26,7 @@
 }, "audio events - playing");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger playing event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger playing event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("playing", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html b/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html
index f750085ed2b59d..e9714d7ec52640 100644
--- a/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("calling play() on audio should trigger playing event", {timeout:5000});
+  var t = async_test("calling play() on audio should trigger playing event");
   var a = document.getElementById("a");
   a.addEventListener("playing", function() {
     t.done();
@@ -26,7 +26,7 @@
 }, "audio events - playing");
 
 test(function() {
-  var t = async_test("calling play() on video should trigger playing event", {timeout:5000});
+  var t = async_test("calling play() on video should trigger playing event");
   var v = document.getElementById("v");
   v.addEventListener("playing", function() {
     t.done();
diff --git a/html/semantics/embedded-content/media-elements/event_progress.html b/html/semantics/embedded-content/media-elements/event_progress.html
index b29c65ccf5cffd..ae4496c99fb80f 100644
--- a/html/semantics/embedded-content/media-elements/event_progress.html
+++ b/html/semantics/embedded-content/media-elements/event_progress.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on autoplay audio should trigger progress event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay audio should trigger progress event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("progress", t.step_func(function() {
@@ -26,7 +26,7 @@
 }, "audio events - progress");
 
 test(function() {
-  var t = async_test("setting src attribute on autoplay video should trigger progress event", {timeout:5000});
+  var t = async_test("setting src attribute on autoplay video should trigger progress event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("progress", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html b/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html
index cb54dac719943f..8b32448b9fdac5 100644
--- a/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay audio should trigger progress event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay audio should trigger progress event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("progress", t.step_func_done(), false);
@@ -23,7 +23,7 @@
 }, "audio events - progress");
 
 test(function() {
-  var t = async_test("setting src attribute on non-autoplay video should trigger progress event", {timeout:5000});
+  var t = async_test("setting src attribute on non-autoplay video should trigger progress event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("progress", t.step_func_done(), false);
diff --git a/html/semantics/embedded-content/media-elements/event_timeupdate.html b/html/semantics/embedded-content/media-elements/event_timeupdate.html
index cc0a17fe2e5217..0909c864e30c1a 100644
--- a/html/semantics/embedded-content/media-elements/event_timeupdate.html
+++ b/html/semantics/embedded-content/media-elements/event_timeupdate.html
@@ -14,7 +14,7 @@
   </video>
   <div id="log"></div>
   <script>
-var ta = async_test("setting src attribute on a sufficiently long autoplay audio should trigger timeupdate event", {timeout:5000});
+var ta = async_test("setting src attribute on a sufficiently long autoplay audio should trigger timeupdate event");
 var a = document.getElementById("a");
 a.addEventListener("timeupdate", function() {
   ta.done();
@@ -22,7 +22,7 @@
 }, false);
 a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 
-var tv = async_test("setting src attribute on a sufficiently long autoplay video should trigger timeupdate event", {timeout:5000});
+var tv = async_test("setting src attribute on a sufficiently long autoplay video should trigger timeupdate event");
 var v = document.getElementById("v");
 v.addEventListener("timeupdate", function() {
   tv.done();
diff --git a/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html b/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html
index eadd84e20381f1..2738a3b4ac6503 100644
--- a/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html
+++ b/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("calling play() on a sufficiently long audio should trigger timeupdate event", {timeout:5000});
+  var t = async_test("calling play() on a sufficiently long audio should trigger timeupdate event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("timeupdate", t.step_func(function() {
@@ -27,7 +27,7 @@
 }, "audio events - timeupdate");
 
 test(function() {
-  var t = async_test("calling play() on a sufficiently long video should trigger timeupdate event", {timeout:5000});
+  var t = async_test("calling play() on a sufficiently long video should trigger timeupdate event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("timeupdate", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html b/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html
index de66d5cb0eb69e..ac0f56f7d5482b 100644
--- a/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html
+++ b/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html
@@ -18,7 +18,7 @@
     document.body.appendChild(video);
     if (!t1)
         throw new Error('t1 was undefined')
-}, {timeout:25000});
+});
 function smoke_test() {
   assert_true('HTMLTrackElement' in window, 'track not supported');
 }
@@ -56,9 +56,9 @@
 }, document.title+', different modes');
 
 // ok now let's load in a video
-var test1 = async_test(document.title+', video loading', {timeout:20000});
-var test2 = async_test(document.title+', video playing', {timeout:20000});
-var test3 = async_test(document.title+', adding cue during playback', {timeout:20000});
+var test1 = async_test(document.title+', video loading');
+var test2 = async_test(document.title+', video playing');
+var test3 = async_test(document.title+', adding cue during playback');
 test1.step(smoke_test);
 test2.step(smoke_test);
 test3.step(smoke_test);
diff --git a/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html b/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html
index 2679413348c857..622ec4abfd5e2d 100644
--- a/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html
+++ b/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html
@@ -7,7 +7,7 @@
 setup(function(){
     window.video = document.createElement('video');
     document.body.appendChild(video);
-}, {timeout:5000});
+});
 test(function() {
     var t1 = video.addTextTrack('subtitles');
     var t2 = video.addTextTrack('subtitles');
diff --git a/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html b/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html
index 3623f44bbc0968..a05c0b17442b69 100644
--- a/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html
+++ b/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html
@@ -7,7 +7,7 @@
 setup(function(){
     window.video = document.createElement('video');
     document.body.appendChild(video);
-}, {timeout:5000});
+});
 test(function() {
     var t1 = video.addTextTrack('subtitles');
     var t2 = video.addTextTrack('subtitles');
diff --git a/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html b/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html
index 8f0fffc612a006..e0e1f510190e36 100644
--- a/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html
+++ b/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html
@@ -14,7 +14,7 @@
   </video>
   <div id="log"></div>
   <script>
-var ta = async_test("audioElement.networkState should be NETWORK_LOADING during loadstart event", {timeout:5000});
+var ta = async_test("audioElement.networkState should be NETWORK_LOADING during loadstart event");
 var a = document.getElementById("a");
 a.addEventListener("loadstart", function() {
   ta.step(function() {
@@ -26,7 +26,7 @@
 }, false);
 a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 
-var tv = async_test("videoElement.networkState should be NETWORK_LOADING during loadstart event", {timeout:5000});
+var tv = async_test("videoElement.networkState should be NETWORK_LOADING during loadstart event");
 var v = document.getElementById("v");
 v.addEventListener("loadstart", function() {
   tv.step(function() {
diff --git a/html/semantics/embedded-content/media-elements/networkState_during_progress.html b/html/semantics/embedded-content/media-elements/networkState_during_progress.html
index 141968a299e25b..db9df23cb651d0 100644
--- a/html/semantics/embedded-content/media-elements/networkState_during_progress.html
+++ b/html/semantics/embedded-content/media-elements/networkState_during_progress.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var ta = async_test("audioElement.networkState should be NETWORK_LOADING during progress event", {timeout:5000});
+  var ta = async_test("audioElement.networkState should be NETWORK_LOADING during progress event");
   var a = document.getElementById("a");
   a.addEventListener("error", ta.unreached_func());
   a.addEventListener("progress", ta.step_func(function() {
@@ -27,7 +27,7 @@
 }, "audio events - networkState during progress");
 
 test(function() {
-  var tv = async_test("videoElement.networkState should be NETWORK_LOADING during progress event", {timeout:5000});
+  var tv = async_test("videoElement.networkState should be NETWORK_LOADING during progress event");
   var v = document.getElementById("v");
   v.addEventListener("error", tv.unreached_func());
   v.addEventListener("progress", tv.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/paused_false_during_play.html b/html/semantics/embedded-content/media-elements/paused_false_during_play.html
index b5d3071388a178..946deecf433969 100644
--- a/html/semantics/embedded-content/media-elements/paused_false_during_play.html
+++ b/html/semantics/embedded-content/media-elements/paused_false_during_play.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("audio.paused should be false during play event", {timeout:5000});
+  var t = async_test("audio.paused should be false during play event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("play", t.step_func(function() {
@@ -27,7 +27,7 @@
 }, "audio events - paused property");
 
 test(function() {
-  var t = async_test("video.paused should be false during play event", {timeout:5000});
+  var t = async_test("video.paused should be false during play event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("play", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/paused_true_during_pause.html b/html/semantics/embedded-content/media-elements/paused_true_during_pause.html
index 2a9335bd4e6026..817615c5cb543f 100644
--- a/html/semantics/embedded-content/media-elements/paused_true_during_pause.html
+++ b/html/semantics/embedded-content/media-elements/paused_true_during_pause.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("audio.paused should be true during pause event", {timeout:5000});
+  var t = async_test("audio.paused should be true during pause event");
   var a = document.getElementById("a");
   a.addEventListener("pause", function() {
     t.step(function() {
@@ -30,7 +30,7 @@
 }, "audio events - paused property");
 
 test(function() {
-  var t = async_test("video.paused should be true during pause event", {timeout:5000});
+  var t = async_test("video.paused should be true during pause event");
   var v = document.getElementById("v");
   v.addEventListener("pause", function() {
     t.step(function() {
diff --git a/html/semantics/embedded-content/media-elements/readyState_during_canplay.html b/html/semantics/embedded-content/media-elements/readyState_during_canplay.html
index 5ab3f881b40b11..358a87fe216fba 100644
--- a/html/semantics/embedded-content/media-elements/readyState_during_canplay.html
+++ b/html/semantics/embedded-content/media-elements/readyState_during_canplay.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("audio.readyState should be >= HAVE_FUTURE_DATA during canplay event", {timeout:5000});
+  var t = async_test("audio.readyState should be >= HAVE_FUTURE_DATA during canplay event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("canplay", t.step_func(function() {
@@ -27,7 +27,7 @@
 }, "audio events - readyState property during canplay");
 
 test(function() {
-  var t = async_test("video.readyState should be >= HAVE_FUTURE_DATA during canplay event", {timeout:5000});
+  var t = async_test("video.readyState should be >= HAVE_FUTURE_DATA during canplay event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("canplay", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html b/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html
index 2b1910dfd821df..2721d186336ff1 100644
--- a/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html
+++ b/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("audio.readyState should be HAVE_ENOUGH_DATA during canplaythrough event", {timeout:5000});
+  var t = async_test("audio.readyState should be HAVE_ENOUGH_DATA during canplaythrough event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("canplaythrough", t.step_func(function() {
@@ -27,7 +27,7 @@
 }, "audio events - readyState property during canplaythrough");
 
 test(function() {
-  var t = async_test("video.readyState should be HAVE_ENOUGH_DATA during canplaythrough event", {timeout:5000});
+  var t = async_test("video.readyState should be HAVE_ENOUGH_DATA during canplaythrough event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("canplaythrough", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html b/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html
index 7c5838381bb32a..f237b1fbd332bf 100644
--- a/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html
+++ b/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event", {timeout:5000});
+  var t = async_test("audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("loadeddata", t.step_func(function() {
@@ -27,7 +27,7 @@
 }, "audio events - readyState property during loadeddata");
 
 test(function() {
-  var t = async_test("video.readyState should be >= HAVE_CURRENT_DATA during loadeddata event", {timeout:5000});
+  var t = async_test("video.readyState should be >= HAVE_CURRENT_DATA during loadeddata event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("loadeddata", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html b/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html
index 752d79cdcb4114..73f33f0b98bbe1 100644
--- a/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html
+++ b/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("audio.readyState should be >= HAVE_METADATA during loadedmetadata event", {timeout:5000});
+  var t = async_test("audio.readyState should be >= HAVE_METADATA during loadedmetadata event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("loadedmetadata", t.step_func(function() {
@@ -27,7 +27,7 @@
 }, "audio events - readyState property during loadedmetadata");
 
 test(function() {
-  var t = async_test("video.readyState should be >= HAVE_METADATA during loadedmetadata event", {timeout:5000});
+  var t = async_test("video.readyState should be >= HAVE_METADATA during loadedmetadata event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("loadedmetadata", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/readyState_during_playing.html b/html/semantics/embedded-content/media-elements/readyState_during_playing.html
index 5e8809851ec478..663bad701b00a9 100644
--- a/html/semantics/embedded-content/media-elements/readyState_during_playing.html
+++ b/html/semantics/embedded-content/media-elements/readyState_during_playing.html
@@ -15,7 +15,7 @@
   <div id="log"></div>
   <script>
 test(function() {
-  var t = async_test("audio.readyState should be >= HAVE_FUTURE_DATA during playing event", {timeout:5000});
+  var t = async_test("audio.readyState should be >= HAVE_FUTURE_DATA during playing event");
   var a = document.getElementById("a");
   a.addEventListener("error", t.unreached_func());
   a.addEventListener("playing", t.step_func(function() {
@@ -27,7 +27,7 @@
 }, "audio events - readyState property during playing");
 
 test(function() {
-  var t = async_test("video.readyState should be >= HAVE_FUTURE_DATA during playing event", {timeout:5000});
+  var t = async_test("video.readyState should be >= HAVE_FUTURE_DATA during playing event");
   var v = document.getElementById("v");
   v.addEventListener("error", t.unreached_func());
   v.addEventListener("playing", t.step_func(function() {
diff --git a/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js b/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js
index 9d48abde09d911..dca0bdfada4ad2 100644
--- a/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js
+++ b/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js
@@ -12,7 +12,7 @@ setup(function(){
 }, {timeout:10000, explicit_done:true});
 
 onload = function() {
-    (async_test(document.title, {timeout:10000})).step(function() {
+    (async_test(document.title)).step(function() {
         // fail early if track isn't supported
         assert_true('HTMLTrackElement' in window, 'track not supported');
         window.corsMode = document.title.match(/^track CORS: (No CORS|Anonymous|Use Credentials)/)[1];
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/078.html b/html/semantics/scripting-1/the-script-element/execution-timing/078.html
index 4d42b7242fd041..644c543611ecca 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/078.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/078.html
@@ -15,7 +15,7 @@
         }
         return testlib.addScript(contents, props, head, false);
     }
-    var t = async_test(undefined, { timeout: 10000 })
+    var t = async_test()
 
     function test() {
         document.getElementById("log").textContent = "Please wait..."
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/081.html b/html/semantics/scripting-1/the-script-element/execution-timing/081.html
index ad0ab926659936..1b9bc991c69355 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/081.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/081.html
@@ -10,7 +10,7 @@
   <div id="log">FAILED (This TC requires JavaScript enabled)</div>
   <div></div>
   <script>
-  var t = async_test(undefined, {timeout:5000})
+  var t = async_test()
   log('inline script #1');
   testlib.addScript('', { src:'scripts/include-1.js?pipe=trickle(d1)&'+Math.random() }, document.getElementsByTagName('head')[0], false );
   log('end script #1');
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/082.html b/html/semantics/scripting-1/the-script-element/execution-timing/082.html
index c6f112e6e8681a..83745544acfefb 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/082.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/082.html
@@ -22,7 +22,7 @@
   </script>
   <script type="text/javascript">
   log('inline script #2');
-  var t = async_test(undefined, {timeout:10000})
+  var t = async_test()
 
   function test() {
     assert_array_equals(eventOrder, ['inline script #1', 'end script #1', 'inline script #2', 'external script #1', 'load on include-1.js', 'external script #7', 'load on include-7.js', 'external script #2', 'load on include-2.js']);
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/091.html b/html/semantics/scripting-1/the-script-element/execution-timing/091.html
index c9c7f81dcdae4c..f706cd31f52a12 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/091.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/091.html
@@ -10,7 +10,7 @@
         <div id="log">FAILED (This TC requires JavaScript enabled)</div>
 
         <script>
-          var t = async_test(undefined, {timeout:4000});
+          var t = async_test();
 
           sources = ["scripts/include-1.js?pipe=trickle(d2)", "scripts/include-2.js?pipe=trickle(d1)"];
           sources.forEach(function(x) {
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/092.html b/html/semantics/scripting-1/the-script-element/execution-timing/092.html
index 1fd78239ab9eea..40fda5a0c0d2b2 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/092.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/092.html
@@ -10,7 +10,7 @@
         <div id="log">FAILED (This TC requires JavaScript enabled)</div>
 
         <script>
-          var t = async_test(undefined, {timeout:3500});
+          var t = async_test();
 
           var script = document.createElement("script");
           script.src = "scripts/include-2.js?pipe=trickle(d2)";
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/094.html b/html/semantics/scripting-1/the-script-element/execution-timing/094.html
index 42f84cc2a658f0..cc9d1bf0fbee41 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/094.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/094.html
@@ -11,7 +11,7 @@
         <iframe id="myFrame"></iframe>
 
         <script>
-          var t = async_test(undefined, {timeout:3500});
+          var t = async_test();
           onload = t.step_func(function() {
             var doc = document.getElementById("myFrame").contentDocument;
             var win = document.getElementById("myFrame").contentWindow;
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/095.html b/html/semantics/scripting-1/the-script-element/execution-timing/095.html
index b2d7d8fa4ce17a..5e3b388cf1e87a 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/095.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/095.html
@@ -10,7 +10,7 @@
         <div id="log">FAILED (This TC requires JavaScript enabled)</div>
 
         <script>
-          var t = async_test(undefined, {timeout:3500});
+          var t = async_test();
           function test() {
             t.step(function() {
               assert_array_equals(eventOrder, ['external script #8', 'external script #9']);
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/097.html b/html/semantics/scripting-1/the-script-element/execution-timing/097.html
index 4b4e4c61f9ef15..a31d49e5b09f55 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/097.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/097.html
@@ -15,7 +15,7 @@
         </script>
         <script>
           log("inline script #2");
-          var t = async_test(undefined, {timeout:3500});
+          var t = async_test();
 
           addEventListener("DOMContentLoaded", t.step_func(function() {assert_array_equals(eventOrder, ["inline script #1", "inline script #2"])}), false);
 
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/122.html b/html/semantics/scripting-1/the-script-element/execution-timing/122.html
index 35e1c2eb738f0f..a8994c6aebbd9c 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/122.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/122.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:4000});
+  var t = async_test();
 </script>
 <script id="test" type="text/plain" src="scripts/include-1.js?pipe=trickle(d1)"></script>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/123.html b/html/semantics/scripting-1/the-script-element/execution-timing/123.html
index 9fe29989a57340..dc145eb550b802 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/123.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/123.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:4000});
+  var t = async_test();
 </script>
 <script id="test" type="text/plain" src="scripts/include-2.js?pipe=trickle(d1)"></script>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/125.html b/html/semantics/scripting-1/the-script-element/execution-timing/125.html
index 985ccf1eab6449..5074f2a107bf1b 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/125.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/125.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:4000});
+  var t = async_test();
 </script>
 <script id="test" type="text/plain" src="scripts/include-1.js?pipe=trickle(d1)"></script>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/126.html b/html/semantics/scripting-1/the-script-element/execution-timing/126.html
index 65d88c5293cc49..1b2bb176348c8d 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/126.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/126.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:4000});
+  var t = async_test();
 </script>
 <script id="test" type="text/plain" src="scripts/include-2.js"></script>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/136.html b/html/semantics/scripting-1/the-script-element/execution-timing/136.html
index 4ed1ed80c3c272..b08a8b97989b95 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/136.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/136.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/137.html b/html/semantics/scripting-1/the-script-element/execution-timing/137.html
index 0f71dcd1004766..35a49b806d9abd 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/137.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/137.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script xlink:href="">
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/138.html b/html/semantics/scripting-1/the-script-element/execution-timing/138.html
index b2f4e81d0dc5d9..0ff25471e0f976 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/138.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/138.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/139.html b/html/semantics/scripting-1/the-script-element/execution-timing/139.html
index 98ca7439e5b6b9..7bb703d8a2c8f0 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/139.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/139.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/140.html b/html/semantics/scripting-1/the-script-element/execution-timing/140.html
index 3f7db18ae437c1..9b54d09d58df7c 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/140.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/140.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script xlink:href="scripts/include-1.js">
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/141.html b/html/semantics/scripting-1/the-script-element/execution-timing/141.html
index da4dbeb48f499e..54aa3f3686e8fa 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/141.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/141.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/142.html b/html/semantics/scripting-1/the-script-element/execution-timing/142.html
index b2b83dc8782ec8..d314eddb906fad 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/142.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/142.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/143.html b/html/semantics/scripting-1/the-script-element/execution-timing/143.html
index 4c0151530025c3..a0d9012f6877db 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/143.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/143.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script>
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/144.html b/html/semantics/scripting-1/the-script-element/execution-timing/144.html
index a3c764d527ef80..3962c4d6923b36 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/144.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/144.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script type="text/plain">
diff --git a/html/semantics/scripting-1/the-script-element/execution-timing/145.html b/html/semantics/scripting-1/the-script-element/execution-timing/145.html
index d7897ee82a37c1..9e2d73bafcd152 100644
--- a/html/semantics/scripting-1/the-script-element/execution-timing/145.html
+++ b/html/semantics/scripting-1/the-script-element/execution-timing/145.html
@@ -7,7 +7,7 @@
 </head>
 <div id="log"></div>
 <script>
-  var t = async_test(undefined, {timeout:3000});
+  var t = async_test();
 </script>
 <svg>
 <script></script>