diff --git a/long-animation-frame/tentative/loaf-stream-source-location.html b/long-animation-frame/tentative/loaf-stream-source-location.html
index 0fd30859d738de..5776ff52552436 100644
--- a/long-animation-frame/tentative/loaf-stream-source-location.html
+++ b/long-animation-frame/tentative/loaf-stream-source-location.html
@@ -17,7 +17,8 @@ <h1>Long Animation Frame: source location extraction for streams</h1>
     const scriptElement = document.createElement("script");
     scriptElement.src = scriptLocation;
     document.body.appendChild(scriptElement);
-  }, script => script.invoker === "StreamPromise.resolve.then", t);
+  }, script => {
+     return script.invoker === "Promise.resolve" }, t);
 
   assert_true(script.sourceURL.includes("stream-promise-generates-loaf.js"));
 }, "Source location should be extracted for stream promises");
diff --git a/long-animation-frame/tentative/loaf-stream.html b/long-animation-frame/tentative/loaf-stream.html
index e35bc2f9aa7d7d..424f2cd0d1e629 100644
--- a/long-animation-frame/tentative/loaf-stream.html
+++ b/long-animation-frame/tentative/loaf-stream.html
@@ -34,6 +34,6 @@ <h1>Long Animation Frame: stream promise resolvers</h1>
     });
     response.body.pipeTo(writable);
     await readable.getReader().read();
-}, "resolve", "StreamPromise.resolve");
+}, "resolve", "Promise.resolve");
 </script>
 </body>
diff --git a/streams/piping/detached-context-crash.html b/streams/piping/detached-context-crash.html
new file mode 100644
index 00000000000000..56271f12c3ae76
--- /dev/null
+++ b/streams/piping/detached-context-crash.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<body>
+<script>
+window.onload = () => {
+  const i = document.createElement("iframe");
+  i.src = "about:blank";
+  document.body.appendChild(i);
+
+  const rs = new i.contentWindow.ReadableStream({
+    start(controller) { controller.error(); }
+  });
+  const ws = new i.contentWindow.WritableStream();
+
+  i.remove();
+
+  // pipeTo() should not crash with a ReadableStream or WritableStream from
+  // a detached iframe.
+  rs.pipeTo(ws);
+};
+</script>
+</body>
diff --git a/streams/readable-streams/tee-detached-context-crash.html b/streams/readable-streams/tee-detached-context-crash.html
new file mode 100644
index 00000000000000..9488da72732e00
--- /dev/null
+++ b/streams/readable-streams/tee-detached-context-crash.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<body>
+<script>
+const i = document.createElement("iframe");
+document.body.appendChild(i);
+
+const rs = new i.contentWindow.ReadableStream();
+i.remove();
+
+// tee() on a ReadableStream from a detached iframe should not crash.
+rs.tee();
+</script>
+</body>
