diff --git a/exist-parent/pom.xml b/exist-parent/pom.xml
index 8e972a17cb9..9808ddf83e4 100644
--- a/exist-parent/pom.xml
+++ b/exist-parent/pom.xml
@@ -132,6 +132,7 @@
         <awaitility.version>4.3.0</awaitility.version>
         <junit.toolbox.version>2.4</junit.toolbox.version>
         <hamcrest.version>3.0</hamcrest.version>
+        <surefire.version>3.5.4</surefire.version>
 
         <!-- needed just for the license-maven-plugin in this module! -->
         <project.parent.relativePath>.</project.parent.relativePath>
@@ -624,7 +625,8 @@
                         <nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
                         <!-- The OSS Index Server (https://ossindex.sonatype.org) can sometimes be flaky -->
                         <ossIndexWarnOnlyOnRemoteErrors>true</ossIndexWarnOnlyOnRemoteErrors>
-
+                        <ossIndexUsername>${env.OSSINDEX_USERNAME}</ossIndexUsername>
+                        <ossIndexPassword>${env.OSSINDEX_TOKEN}</ossIndexPassword>
                         <archiveAnalyzerEnabled>false</archiveAnalyzerEnabled>
                         <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
                         <autoconfAnalyzerEnabled>false</autoconfAnalyzerEnabled>
@@ -796,8 +798,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <!-- NOTE: version 3.5.3 fails to run XSuite tests -->
-                    <version>3.5.2</version>
+                    <version>${surefire.version}</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.junit.platform</groupId>
@@ -852,12 +853,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>3.5.4</version>
+                    <version>${surefire.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.5.4</version>
+                    <version>${surefire.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -979,6 +980,13 @@
                         </goals>
                         <configuration>
                             <rules>
+                                <requireSameVersions>
+                                    <plugins>
+                                        <plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
+                                        <plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
+                                        <plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
+                                    </plugins>
+                                </requireSameVersions>
                                 <requireJavaVersion>
                                     <version>${maven.compiler.target}</version>
                                     <message>eXist-db requires (at least) OpenJDK ${maven.compiler.target} to build and run. Detected ${java.vendor} OpenJDK ${java.version}. Please upgrade.</message>
@@ -1164,6 +1172,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>${surefire.version}</version>
                 <configuration>
                     <aggregate>true</aggregate>
                 </configuration>