diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml
index f40d7838..fd6e0e33 100644
--- a/Mustang-CLI/pom.xml
+++ b/Mustang-CLI/pom.xml
@@ -39,9 +39,15 @@
          <version>0.3.0</version>
       </dependency>
       <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <version>4.13.1</version>
+         <groupId>org.junit.jupiter</groupId>
+         <artifactId>junit-jupiter-api</artifactId>
+         <version>5.9.1</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.junit.vintage</groupId>
+         <artifactId>junit-vintage-engine</artifactId>
+         <version>5.9.1</version>
          <scope>test</scope>
       </dependency>
 <!-- for directory validation: -->
diff --git a/library/pom.xml b/library/pom.xml
index db8d8ed4..2b10504b 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -86,11 +86,17 @@
 			<version>2.1.3</version>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.9.1</version>
 			<scope>test</scope>
-		</dependency>
+		 </dependency>
+		 <dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<version>5.9.1</version>
+			<scope>test</scope>
+		 </dependency>
 
 		<!-- CII to UBL conversion -->
 		<dependency>
diff --git a/library/src/test/resources/junit-platform.properties b/library/src/test/resources/junit-platform.properties
new file mode 100644
index 00000000..eb14fb85
--- /dev/null
+++ b/library/src/test/resources/junit-platform.properties
@@ -0,0 +1,2 @@
+# ClassOrderer$OrderAnnotation sorts classes based on their @Order annotation
+junit.jupiter.testclass.order.default=org.junit.jupiter.api.ClassOrderer$ClassName
diff --git a/validator/pom.xml b/validator/pom.xml
index ca728123..5193c1b4 100644
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -35,6 +35,11 @@
 
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>library</artifactId>
+            <version>2.5.8-SNAPSHOT</version>
+        </dependency>
         <!-- for java9 -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -108,11 +113,17 @@
             <version>0.3.0</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.1</version>
             <scope>test</scope>
-        </dependency>
+         </dependency>
+         <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.9.1</version>
+            <scope>test</scope>
+         </dependency>
     </dependencies>
     <build>
         <pluginManagement>
diff --git a/validator/src/test/resources/junit-platform.properties b/validator/src/test/resources/junit-platform.properties
new file mode 100644
index 00000000..eb14fb85
--- /dev/null
+++ b/validator/src/test/resources/junit-platform.properties
@@ -0,0 +1,2 @@
+# ClassOrderer$OrderAnnotation sorts classes based on their @Order annotation
+junit.jupiter.testclass.order.default=org.junit.jupiter.api.ClassOrderer$ClassName