diff --git a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004-1.html b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004-1.html
deleted file mode 100644
index c50eddd41faba2..00000000000000
--- a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004-1.html
+++ /dev/null
@@ -1 +0,0 @@
-<!doctype html>
diff --git a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004.html b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004.html
index 0b3220279fd561..3fb443a99314aa 100644
--- a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004.html
+++ b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/004.html
@@ -3,7 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<iframe src="004-1.html"></iframe>
+<iframe src="/common/blank.html"></iframe>
 <script>
 var t = async_test();
 var iframe;
diff --git a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/005.html b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/005.html
index 24725b76fb1c3a..e849c31560e8fc 100644
--- a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/005.html
+++ b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/005.html
@@ -3,7 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<iframe src="004-1.html"></iframe>
+<iframe src="/common/blank.html"></iframe>
 <script>
 var t = async_test();
 var iframe;
diff --git a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/006.html b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/006.html
index ae5edc457dacd5..1dcb92615d085b 100644
--- a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/006.html
+++ b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/006.html
@@ -3,7 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<iframe src="004-1.html"></iframe>
+<iframe src="/common/blank.html"></iframe>
 <script>
 var t = async_test();
 var iframe;
diff --git a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/007.html b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/007.html
deleted file mode 100644
index e5f0d1561ef6e9..00000000000000
--- a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/007.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<title>Unregistering event handlers after document.open</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<iframe src="004-1.html"></iframe>
-<script>
-var t = async_test();
-var iframe;
-onload = t.step_func(function() {
-  var iframe = document.getElementsByTagName("iframe")[0];
-  iframe.contentDocument.onclick = t.step_func(function() {assert_unreached()})
-  iframe.contentDocument.open();
-  var e = iframe.contentDocument.createEvent("mouseevents")
-  e.initEvent("click", false, false);
-  iframe.contentDocument.dispatchEvent(e);
-  setTimeout(function() {t.done();}, 500);
-});
-</script>
diff --git a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/008.html b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/008.html
index 7471b2203169fd..36c0a3f3ea11b9 100644
--- a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/008.html
+++ b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/008.html
@@ -3,7 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<iframe src="004-1.html"></iframe>
+<iframe src="/common/blank.html"></iframe>
 <script>
 var t = async_test();
 var iframe;
diff --git a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/009.https.html b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/009.https.html
index 3f51fa40dfa50c..0d104c9569b373 100644
--- a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/009.https.html
+++ b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/009.https.html
@@ -3,7 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
-<iframe src="004-1.html"></iframe>
+<iframe src="/common/blank.html"></iframe>
 <script>
 var iframe = document.getElementsByTagName("iframe")[0];
 var steps;
diff --git a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js
index 97334ce1bab8f1..58ec08f9ff110a 100644
--- a/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js
+++ b/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js
@@ -1,3 +1,14 @@
+test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe")),
+        body = frame.contentDocument.body;
+  t.add_cleanup(() => frame.remove());
+  const div = body.appendChild(frame.contentDocument.createElement("div"));
+  div.addEventListener("click", t.unreached_func("element event listener not removed"));
+  frame.contentDocument.open();
+  div.click();
+  frame.contentDocument.close();
+}, "Standard event listeners are to be removed");
+
 test(t => {
   const frame = document.body.appendChild(document.createElement("iframe")),
         body = frame.contentDocument.body;
@@ -8,7 +19,64 @@ test(t => {
   frame.contentDocument.dispatchEvent(new Event("x"));
   body.dispatchEvent(new Event("x"));
   frame.contentDocument.close();
-}, "Event listeners are to be removed");
+}, "Custom event listeners are to be removed");
+
+test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe")),
+        body = frame.contentDocument.body;
+  t.add_cleanup(() => frame.remove());
+  // Focus on the current window so that the frame's window is blurred.
+  window.focus();
+  assert_false(frame.contentDocument.hasFocus());
+  frame.contentWindow.addEventListener("focus", t.unreached_func("window event listener not removed"));
+  body.onfocus = t.unreached_func("body event listener not removed");
+  frame.contentDocument.open();
+  assert_equals(body.onfocus, null);
+  frame.contentWindow.focus();
+  frame.contentDocument.close();
+}, "Standard event listeners are to be removed from Window");
+
+test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe"));
+  t.add_cleanup(() => frame.remove());
+  frame.contentWindow.addEventListener("x", t.unreached_func("window event listener not removed"));
+  frame.contentDocument.open();
+  frame.contentWindow.dispatchEvent(new Event("x"));
+  frame.contentDocument.close();
+}, "Custom event listeners are to be removed from Window");
+
+test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe")),
+        body = frame.contentDocument.body;
+  t.add_cleanup(() => frame.remove());
+  const div = body.appendChild(frame.contentDocument.createElement("div"));
+  div.onclick = t.unreached_func("element event listener not removed");
+  frame.contentDocument.open();
+  assert_equals(div.onclick, null);
+  const e = frame.contentDocument.createEvent("mouseevents")
+  e.initEvent("click", false, false);
+  div.dispatchEvent(e);
+  frame.contentDocument.close();
+}, "IDL attribute event handlers are to be deactivated");
+
+var thrower;
+
+test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe")),
+        body = frame.contentDocument.body;
+  t.add_cleanup(() => frame.remove());
+  const div = body.appendChild(frame.contentDocument.createElement("div"));
+  thrower = t.step_func(() => { throw new Error('element event listener not removed'); });
+  div.setAttribute("onclick", "parent.thrower()");
+  assert_not_equals(div.onclick, null);
+  frame.contentDocument.open();
+  assert_equals(div.getAttribute("onclick"), "parent.thrower()");
+  assert_equals(div.onclick, null);
+  const e = frame.contentDocument.createEvent("mouseevents")
+  e.initEvent("click", false, false);
+  div.dispatchEvent(e);
+  frame.contentDocument.close();
+}, "Content attribute event handlers are to be deactivated");
 
 test(t => {
   const frame = document.body.appendChild(document.createElement("iframe"));
