diff --git a/exo.jcr.component.core/pom.xml b/exo.jcr.component.core/pom.xml
index 083bd43f5..eac22e560 100644
--- a/exo.jcr.component.core/pom.xml
+++ b/exo.jcr.component.core/pom.xml
@@ -388,7 +388,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-               <argLine>@{surefire.argLine} -Djava.net.preferIPv4Stack=true</argLine>
+               <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED -Djava.net.preferIPv4Stack=true ${debug.opts}</argLine>
                <systemProperties>
                   <property>
                      <name>jcr.test.configuration.file</name>
diff --git a/exo.jcr.component.ext/pom.xml b/exo.jcr.component.ext/pom.xml
index d2f94a9e4..b987f89bc 100644
--- a/exo.jcr.component.ext/pom.xml
+++ b/exo.jcr.component.ext/pom.xml
@@ -93,6 +93,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
+            <argLine>@{argLine} ${env.MAVEN_OPTS}  --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED ${debug.opts}</argLine>
             <systemProperties>
                <property>
                   <name>jcr.test.configuration.file</name>
diff --git a/exo.jcr.component.ftp/pom.xml b/exo.jcr.component.ftp/pom.xml
index 3d6df88a3..ec4933e17 100644
--- a/exo.jcr.component.ftp/pom.xml
+++ b/exo.jcr.component.ftp/pom.xml
@@ -52,6 +52,12 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
diff --git a/exo.jcr.component.webdav/pom.xml b/exo.jcr.component.webdav/pom.xml
index ddd09df20..12157ea14 100644
--- a/exo.jcr.component.webdav/pom.xml
+++ b/exo.jcr.component.webdav/pom.xml
@@ -55,6 +55,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
           <excludes>
             <exclude>**/TestUtils.java</exclude>
             <exclude>**/OrderPatchTest.java</exclude>
diff --git a/exo.jcr.ext.services/pom.xml b/exo.jcr.ext.services/pom.xml
index a2ac0edcd..ef4d74259 100644
--- a/exo.jcr.ext.services/pom.xml
+++ b/exo.jcr.ext.services/pom.xml
@@ -87,7 +87,7 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>@{argLine} @{surefire.argLine} -Djava.net.preferIPv4Stack=true</argLine>
+          <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED -Djava.net.preferIPv4Stack=true ${debug.opts}</argLine>
         </configuration>
       </plugin>
       <plugin>
diff --git a/exo.jcr.framework.command/pom.xml b/exo.jcr.framework.command/pom.xml
index b545a86f1..2b6b23fd5 100644
--- a/exo.jcr.framework.command/pom.xml
+++ b/exo.jcr.framework.command/pom.xml
@@ -52,6 +52,12 @@
    </dependencies>
   <build>
     <plugins>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>@{argLine} ${env.MAVEN_OPTS} --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
+            </configuration>
+         </plugin>
          <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
diff --git a/exo.jcr.framework.ftpclient/pom.xml b/exo.jcr.framework.ftpclient/pom.xml
index 300057c12..0afdd8f9c 100644
--- a/exo.jcr.framework.ftpclient/pom.xml
+++ b/exo.jcr.framework.ftpclient/pom.xml
@@ -61,7 +61,8 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
-            <skipTests>true</skipTests>
+            <argLine>@{argLine} ${env.MAVEN_OPTS}</argLine>
+            <skipTests>true</skipTests> 
             <includes>
               <include>**/*.java</include>
             </includes>