diff --git a/changes.xml b/changes.xml
index 706226f..c990248 100644
--- a/changes.xml
+++ b/changes.xml
@@ -30,6 +30,9 @@
       <action type="update" dev="sseifert">
         Update testing dependencies.
       </action>
+      <action type="update" dev="sseifert">
+        Disable parallel test execution for JUnit 5 for Java 21: We had problems in some modules with ThreadsafeMockAdapterManagerWrapper not working properly on GitHub runners.
+      </action>
     </release>
 
     <release version="2.2.2" date="2023-09-04">
diff --git a/pom.xml b/pom.xml
index e237ab9..cf14bde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -452,6 +452,7 @@
   </reporting>
 
   <profiles>
+
     <!-- profile used for building releases and deployment to sonatype/maven central -->
     <profile>
       <id>release-profile</id>
@@ -494,6 +495,32 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- Disable parallel test execution for JUnit 5 for Java 21: We had problems in some modules with ThreadsafeMockAdapterManagerWrapper not working properly on GitHub runners -->
+    <profile>
+      <id>disable-junit5-parallel-test-execution-java21</id>
+      <activation>
+        <jdk>21</jdk>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <properties>
+                  <configurationParameters>
+                    junit.jupiter.execution.parallel.enabled = false
+                  </configurationParameters>
+                </properties>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+
   </profiles>
 
   <distributionManagement>