diff --git a/srcmorph-cli/pom.xml b/srcmorph-cli/pom.xml
index 467c39a..1d442fe 100644
--- a/srcmorph-cli/pom.xml
+++ b/srcmorph-cli/pom.xml
@@ -210,7 +210,8 @@ SPDX-License-Identifier: Apache-2.0
                             a 2 GB heap cap, a heap dump on OutOfMemoryError into the working
                             directory, and a JVM fatal-error log named per crashing PID.
                         -->
-                        <argLine>@{argLine} -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=. -XX:ErrorFile=hs_err_pid%p.log</argLine>
+                        <!-- -XX:+EnableDynamicAgentLoading: silences the JDK 21 byte-buddy self-attach agent warning that intermittently corrupts Surefire's fork channel ("Corrupted channel ..." / bogus "timeout in the fork"). See workspace policy ci-test-diagnostics.md section 2.1: https://github.com/bernardladenthin/workspace/blob/main/policies/ci-test-diagnostics.md - root cause: https://github.com/raphw/byte-buddy/issues/1639 -->
+                        <argLine>@{argLine} -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=. -XX:ErrorFile=hs_err_pid%p.log -XX:+EnableDynamicAgentLoading</argLine>
                         <!--
                             Force classpath-only test execution. Surefire's default module-path
                             auto-detection activates as soon as module-info.class exists in
diff --git a/srcmorph-maven-plugin/pom.xml b/srcmorph-maven-plugin/pom.xml
index 36ed9f8..4c6e07e 100644
--- a/srcmorph-maven-plugin/pom.xml
+++ b/srcmorph-maven-plugin/pom.xml
@@ -285,7 +285,8 @@ SPDX-License-Identifier: Apache-2.0
                             a 2 GB heap cap, a heap dump on OutOfMemoryError into the working
                             directory, and a JVM fatal-error log named per crashing PID.
                         -->
-                        <argLine>@{argLine} -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=. -XX:ErrorFile=hs_err_pid%p.log</argLine>
+                        <!-- -XX:+EnableDynamicAgentLoading: silences the JDK 21 byte-buddy self-attach agent warning that intermittently corrupts Surefire's fork channel ("Corrupted channel ..." / bogus "timeout in the fork"). See workspace policy ci-test-diagnostics.md section 2.1: https://github.com/bernardladenthin/workspace/blob/main/policies/ci-test-diagnostics.md - root cause: https://github.com/raphw/byte-buddy/issues/1639 -->
+                        <argLine>@{argLine} -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=. -XX:ErrorFile=hs_err_pid%p.log -XX:+EnableDynamicAgentLoading</argLine>
                         <!--
                             The vmlens interleaving smoke test is meaningful only when run
                             under the vmlens agent (the `vmlens` profile / CI job). Without the
diff --git a/srcmorph/pom.xml b/srcmorph/pom.xml
index a712802..008c63f 100644
--- a/srcmorph/pom.xml
+++ b/srcmorph/pom.xml
@@ -214,7 +214,8 @@ SPDX-License-Identifier: Apache-2.0
                             a 2 GB heap cap, a heap dump on OutOfMemoryError into the working
                             directory, and a JVM fatal-error log named per crashing PID.
                         -->
-                        <argLine>@{argLine} -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=. -XX:ErrorFile=hs_err_pid%p.log</argLine>
+                        <!-- -XX:+EnableDynamicAgentLoading: silences the JDK 21 byte-buddy self-attach agent warning that intermittently corrupts Surefire's fork channel ("Corrupted channel ..." / bogus "timeout in the fork"). See workspace policy ci-test-diagnostics.md section 2.1: https://github.com/bernardladenthin/workspace/blob/main/policies/ci-test-diagnostics.md - root cause: https://github.com/raphw/byte-buddy/issues/1639 -->
+                        <argLine>@{argLine} -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=. -XX:ErrorFile=hs_err_pid%p.log -XX:+EnableDynamicAgentLoading</argLine>
                         <!--
                             Force classpath-mode test execution. module-info.java here is release
                             metadata for downstream module-path consumers only (see its own Javadoc: