diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5ba702d05..b8a55edd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,11 +55,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-m2
       - name: Test with Maven
-        if: ${{ matrix.java == '8' }}
         run: ./mvnw test -B -Dmaven.test.skip=false
-      - name: Test with Maven
-        if: ${{ matrix.java != '8' }}
-        run: ./mvnw test -B -Dmaven.test.skip=false -DargLine="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED"
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         if: (!cancelled())
diff --git a/pom.xml b/pom.xml
index b4f92f0d2..0397df485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,7 +228,9 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
                     <configuration>
-                        <argLine>${argLine} -Dfile.encoding=UTF-8</argLine>
+                        <argLine>
+                            ${argLine} ${surefireArgLine}
+                        </argLine>
                     </configuration>
                     <!--                    please add below configuration if you are using JDK 9 or higher-->
                     <!--                    <configuration>-->
@@ -413,8 +415,8 @@
                         </indent>
                     </java>
                     <pom>
-                        <trimTrailingWhitespace />
-                        <endWithNewline />
+                        <trimTrailingWhitespace/>
+                        <endWithNewline/>
                         <indent>
                             <spaces>true</spaces>
                             <spacesPerTab>4</spacesPerTab>
@@ -445,4 +447,24 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jdk9plus</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                    <surefireArgLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED -Dfile.encoding=UTF-8</surefireArgLine>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <properties>
+                <surefireArgLine> -Dfile.encoding=UTF-8</surefireArgLine>
+            </properties>
+        </profile>
+    </profiles>
 </project>