diff --git a/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/codestyle/xml/MethodNamingConventions.xml b/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/codestyle/xml/MethodNamingConventions.xml
index fcda99cba6..0a1798e969 100644
--- a/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/codestyle/xml/MethodNamingConventions.xml
+++ b/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/rule/codestyle/xml/MethodNamingConventions.xml
@@ -68,8 +68,8 @@ public class Foo {
     
     <test-code>
         <description>#1573 method names should not contain underscores, but skip test methods 1</description>
-        <expected-problems>0</expected-problems>
         <rule-property name="skipTestMethodUnderscores">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 public class Foo {
     @isTest
@@ -80,8 +80,8 @@ public class Foo {
 
     <test-code>
         <description>#1573 method names should not contain underscores, but skip test methods 2</description>
-        <expected-problems>0</expected-problems>
         <rule-property name="skipTestMethodUnderscores">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 public class Foo {
     void testMethod test_barFoo() {}
@@ -91,8 +91,8 @@ public class Foo {
 
     <test-code>
         <description>#1573 method names should not contain underscores, but skip test methods 3</description>
-        <expected-problems>1</expected-problems>
         <rule-property name="skipTestMethodUnderscores">false</rule-property>
+        <expected-problems>1</expected-problems>
         <code><![CDATA[
 public class Foo {
     @isTest
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 455112048a..9b58bdbbaf 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -128,7 +128,6 @@
         </dependency>
 
         <!-- TEST DEPENDENCIES -->
-
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-lang-test</artifactId>
@@ -149,6 +148,12 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.github.stefanbirkner</groupId>
             <artifactId>system-rules</artifactId>
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index 571bd56477..6eb89bf533 100644
--- a/pmd-lang-test/pom.xml
+++ b/pmd-lang-test/pom.xml
@@ -43,42 +43,43 @@
 
 
     <dependencies>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-core</artifactId>
         </dependency>
 
+        <!--
+             the following dependencies are all scope compile,
+             so that they are automatically available to users
+             of the pmd-lang-test module
+        -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>${kotlin.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit</artifactId>
-            <version>${kotlin.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>io.kotlintest</groupId>
             <artifactId>kotlintest-runner-junit5</artifactId>
-            <version>3.1.8</version>
             <scope>compile</scope>
         </dependency>
 
@@ -93,7 +94,7 @@
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-java</artifactId>
-            <version>6.9.0</version>
+            <version>6.12.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index 42542d6a1e..81e1ec7bb3 100644
--- a/pmd-test/pom.xml
+++ b/pmd-test/pom.xml
@@ -15,6 +15,8 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <!-- overrides the default scope from inherited dependency management. -->
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
diff --git a/pom.xml b/pom.xml
index 5c27108f1f..fa827d176a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -269,7 +269,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
 
 
         <javacc.version>5.0</javacc.version>
-        <surefire.version>2.22.0</surefire.version>
+        <surefire.version>2.22.1</surefire.version>
         <checkstyle.version>3.0.0</checkstyle.version>
         <pmd.plugin.version>3.11.0</pmd.plugin.version>
         <ant.version>1.10.1</ant.version>
@@ -436,27 +436,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
                     <configuration>
                         <forkMode>once</forkMode>
                         <runOrder>alphabetical</runOrder>
-                        <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
-                        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
                     </configuration>
-                    <dependencies>
-                        <!-- Junit 5 = Platform + Jupiter (5) + Vintage (3 & 4)-->
-
-                        <!-- Junit platform -->
-                        <!-- Needed to use kotlintest -->
-                        <dependency>
-                            <groupId>org.junit.platform</groupId>
-                            <artifactId>junit-platform-surefire-provider</artifactId>
-                            <version>1.2.0</version>
-                        </dependency>
-
-                        <!-- Junit 3 & 4 engine -->
-                        <dependency>
-                            <groupId>org.junit.vintage</groupId>
-                            <artifactId>junit-vintage-engine</artifactId>
-                            <version>5.3.0-M1</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -830,11 +810,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
                 <artifactId>pmd-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>net.sourceforge.pmd</groupId>
-                <artifactId>pmd-test</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>net.sourceforge.saxon</groupId>
                 <artifactId>saxon</artifactId>
@@ -851,21 +826,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
                 <artifactId>rhino</artifactId>
                 <version>1.7.7.2</version>
             </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-library</artifactId>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>pl.pragmatists</groupId>
-                <artifactId>JUnitParams</artifactId>
-                <version>1.1.1</version>
-            </dependency>
             <dependency>
                 <groupId>net.java.dev.javacc</groupId>
                 <artifactId>javacc</artifactId>
@@ -919,7 +879,12 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
             </dependency>
 
             <!-- TEST DEPENDENCIES -->
-
+            <dependency>
+                <groupId>net.sourceforge.pmd</groupId>
+                <artifactId>pmd-test</artifactId>
+                <version>${project.version}</version>
+                <scope>test</scope>
+            </dependency>
 
             <dependency>
                 <groupId>net.sourceforge.pmd</groupId>
@@ -928,8 +893,48 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
                 <scope>test</scope>
             </dependency>
 
-            <!-- Kotlin -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.12</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-library</artifactId>
+                <version>1.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>pl.pragmatists</groupId>
+                <artifactId>JUnitParams</artifactId>
+                <version>1.1.1</version>
+                <scope>test</scope>
+            </dependency>
 
+            <!-- Junit 5 Engine -->
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>5.4.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>5.4.0</version>
+                <scope>test</scope>
+            </dependency>
+
+            <!-- Junit 3 & 4 engine -->
+            <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>5.4.0</version>
+                <scope>test</scope>
+            </dependency>
+
+            <!-- Kotlin -->
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-stdlib</artifactId>
@@ -957,7 +962,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
                 <version>3.1.8</version>
                 <scope>test</scope>
             </dependency>
-
         </dependencies>
     </dependencyManagement>