diff --git a/cli/js/40_bench.js b/cli/js/40_bench.js
index e1373c990e..a94c782fc5 100644
--- a/cli/js/40_bench.js
+++ b/cli/js/40_bench.js
@@ -47,6 +47,11 @@ function bench(
   optionsOrFn,
   maybeFn,
 ) {
+  // No-op if we're not running in `deno bench` subcommand.
+  if (typeof op_register_bench !== "function") {
+    return;
+  }
+
   if (!registeredWarmupBench) {
     registeredWarmupBench = true;
     const warmupBenchDesc = {
diff --git a/cli/js/40_test.js b/cli/js/40_test.js
index 2e448e8473..d93228940e 100644
--- a/cli/js/40_test.js
+++ b/cli/js/40_test.js
@@ -198,6 +198,11 @@ function testInner(
   maybeFn,
   overrides = {},
 ) {
+  // No-op if we're not running in `deno test` subcommand.
+  if (typeof op_register_test !== "function") {
+    return;
+  }
+
   let testDesc;
   const defaults = {
     ignore: false,
diff --git a/tests/specs/bench/test_and_bench/__test__.jsonc b/tests/specs/bench/test_and_bench/__test__.jsonc
new file mode 100644
index 0000000000..cc072ced22
--- /dev/null
+++ b/tests/specs/bench/test_and_bench/__test__.jsonc
@@ -0,0 +1,5 @@
+// Regression test for https://github.com/denoland/deno/issues/23041
+{
+  "args": "bench main.js",
+  "output": "main.out"
+}
diff --git a/tests/specs/bench/test_and_bench/main.js b/tests/specs/bench/test_and_bench/main.js
new file mode 100644
index 0000000000..5e4a395e90
--- /dev/null
+++ b/tests/specs/bench/test_and_bench/main.js
@@ -0,0 +1,3 @@
+Deno.test("test", () => {});
+
+Deno.bench("bench", () => {});
diff --git a/tests/specs/bench/test_and_bench/main.out b/tests/specs/bench/test_and_bench/main.out
new file mode 100644
index 0000000000..24c13c8e0b
--- /dev/null
+++ b/tests/specs/bench/test_and_bench/main.out
@@ -0,0 +1,3 @@
+[WILDCARD]
+[WILDCARD]main.js
+benchmark[WILDCARD]
diff --git a/tests/specs/test/test_and_bench/__test__.jsonc b/tests/specs/test/test_and_bench/__test__.jsonc
new file mode 100644
index 0000000000..bc91243185
--- /dev/null
+++ b/tests/specs/test/test_and_bench/__test__.jsonc
@@ -0,0 +1,5 @@
+// Regression test for https://github.com/denoland/deno/issues/23041
+{
+  "args": "test main.js",
+  "output": "main.out"
+}
diff --git a/tests/specs/test/test_and_bench/main.js b/tests/specs/test/test_and_bench/main.js
new file mode 100644
index 0000000000..5e4a395e90
--- /dev/null
+++ b/tests/specs/test/test_and_bench/main.js
@@ -0,0 +1,3 @@
+Deno.test("test", () => {});
+
+Deno.bench("bench", () => {});
diff --git a/tests/specs/test/test_and_bench/main.out b/tests/specs/test/test_and_bench/main.out
new file mode 100644
index 0000000000..52a061f21c
--- /dev/null
+++ b/tests/specs/test/test_and_bench/main.out
@@ -0,0 +1,5 @@
+running 1 test from ./main.js
+test ... ok ([WILDCARD])
+
+ok | 1 passed | 0 failed ([WILDCARD])
+