diff --git a/crates/cli/src/bin/wasm-bindgen-test-runner/index-headless.html b/crates/cli/src/bin/wasm-bindgen-test-runner/index-headless.html
index d671a205..8f66a52e 100644
--- a/crates/cli/src/bin/wasm-bindgen-test-runner/index-headless.html
+++ b/crates/cli/src/bin/wasm-bindgen-test-runner/index-headless.html
@@ -13,24 +13,30 @@
           logs.innerHTML += `${msg}\n`;
         }
       };
+
       const orig_console_error = function(...args) {
         const logs = document.getElementById('console_error');
         for (let msg of args) {
           logs.innerHTML += `${msg}\n`;
         }
       };
+
       console.log = function(...args) {
-        if (window.console_log_redirect)
-          window.console_log_redirect(orig_console_log, args);
-        else
-          orig_console_log.apply(this, args);
+        if (window.console_log_redirect) {
+          window.console_log_redirect(args);
+        }
+
+        orig_console_log.apply(this, args);
       };
+
       console.error = function(...args) {
-        if (window.console_error_redirect)
-          window.console_error_redirect(orig_console_error, args);
-        else
-          orig_console_error.apply(this, args);
+        if (window.console_error_redirect) {
+          window.console_error_redirect(args);
+        }
+
+        orig_console_error.apply(this, args);
       };
+
       window.__wbg_test_invoke = f => f();
     </script>
     <script src='run.js' type=module></script>
diff --git a/crates/cli/src/bin/wasm-bindgen-test-runner/index.html b/crates/cli/src/bin/wasm-bindgen-test-runner/index.html
index 073f5ec5..1709af62 100644
--- a/crates/cli/src/bin/wasm-bindgen-test-runner/index.html
+++ b/crates/cli/src/bin/wasm-bindgen-test-runner/index.html
@@ -7,17 +7,21 @@
     <script>
       const orig_console_log = console.log;
       const orig_console_error = console.error;
+
       console.log = function(...args) {
-        if (window.console_log_redirect)
-          window.console_log_redirect(orig_console_log, args);
-        else
-          orig_console_log.apply(this, args);
+        if (window.console_log_redirect) {
+          window.console_log_redirect(args);
+        }
+
+        orig_console_log.apply(this, args);
       };
+
       console.error = function(...args) {
-        if (window.console_error_redirect)
-          window.console_error_redirect(orig_console_error, args);
-        else
-          orig_console_error.apply(this, args);
+        if (window.console_error_redirect) {
+          window.console_error_redirect(args);
+        }
+
+        orig_console_error.apply(this, args);
       };
 
       window.__wbg_test_invoke = f => f();
diff --git a/crates/cli/src/bin/wasm-bindgen-test-runner/node.rs b/crates/cli/src/bin/wasm-bindgen-test-runner/node.rs
index d94d8e92..2bb2fdf4 100644
--- a/crates/cli/src/bin/wasm-bindgen-test-runner/node.rs
+++ b/crates/cli/src/bin/wasm-bindgen-test-runner/node.rs
@@ -24,19 +24,17 @@ pub fn execute(
         // all these calls and capture the output of tests
         const prev_log = console.log;
         console.log = function(...args) {{
-            if (console_log_redirect === null)  {{
-                prev_log.apply(null, args);
-            }} else {{
-                console_log_redirect(prev_log, args);
+            if (console_log_redirect)  {{
+                console_log_redirect(args);
             }}
+            prev_log.apply(null, args);
         }};
         const prev_error = console.error;
         console.error = function(...args) {{
-            if (console_error_redirect === null) {{
-                prev_error.apply(null, args);
-            }} else {{
-                console_error_redirect(prev_error, args);
+            if (console_error_redirect) {{
+                console_error_redirect(args);
             }}
+            prev_error.apply(null, args);
         }};
 
         global.__wbg_test_invoke = f => f();
diff --git a/crates/test/src/rt/mod.rs b/crates/test/src/rt/mod.rs
index 7722095a..e38af165 100644
--- a/crates/test/src/rt/mod.rs
+++ b/crates/test/src/rt/mod.rs
@@ -305,21 +305,20 @@ scoped_thread_local!(static CURRENT_OUTPUT: RefCell<Output>);
 // attach it to. The main `test` crate in the rust repo also has issues about
 // how not all output is captured, causing some inconsistencies sometimes.
 #[wasm_bindgen]
-pub fn __wbgtest_console_log(original: &Function, args: &Array) {
-    record(original, args, |output| &mut output.log)
+pub fn __wbgtest_console_log(args: &Array) {
+    record(args, |output| &mut output.log)
 }
 
 /// Handler for `console.error` invocations.
 ///
 /// Works the same as `console_log` above.
 #[wasm_bindgen]
-pub fn __wbgtest_console_error(original: &Function, args: &Array) {
-    record(original, args, |output| &mut output.error)
+pub fn __wbgtest_console_error(args: &Array) {
+    record(args, |output| &mut output.error)
 }
 
-fn record(orig: &Function, args: &Array, dst: impl FnOnce(&mut Output) -> &mut String) {
+fn record(args: &Array, dst: impl FnOnce(&mut Output) -> &mut String) {
     if !CURRENT_OUTPUT.is_set() {
-        drop(orig.apply(&JsValue::null(), args));
         return;
     }