diff --git a/vaadin-spring-tests/pom.xml b/vaadin-spring-tests/pom.xml
index 0fb11abd7..7bdfdecf1 100644
--- a/vaadin-spring-tests/pom.xml
+++ b/vaadin-spring-tests/pom.xml
@@ -79,6 +79,17 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+         </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/vaadin-spring-tests/test-ts-services/src/test/java/com/vaadin/flow/connect/SpringBootTestTest.java b/vaadin-spring-tests/test-ts-services/src/test/java/com/vaadin/flow/connect/SpringBootTestTest.java
index 5dc4d702a..37db95127 100644
--- a/vaadin-spring-tests/test-ts-services/src/test/java/com/vaadin/flow/connect/SpringBootTestTest.java
+++ b/vaadin-spring-tests/test-ts-services/src/test/java/com/vaadin/flow/connect/SpringBootTestTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.flow.connect;
 
 import org.junit.Assert;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
diff --git a/vaadin-spring/pom.xml b/vaadin-spring/pom.xml
index 4d153ce22..963c0cb4a 100644
--- a/vaadin-spring/pom.xml
+++ b/vaadin-spring/pom.xml
@@ -90,6 +90,18 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- End Spring -->
 
         <!-- Bean validation implementation-->