diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
index 58cc92dfb3..cca1e6bdc2 100644
--- a/gradle/libraries.gradle
+++ b/gradle/libraries.gradle
@@ -10,8 +10,8 @@
 ext {
 
     junitVersion = '4.13.2'
-    junitVintageVersion = '5.7.1'
-    junit5Version = '5.7.1'
+    junitVintageVersion = '5.8.2'
+    junit5Version = '5.8.2'
 
     h2Version = '1.4.197'
     bytemanVersion = '4.0.16' //Compatible with JDK16
diff --git a/hibernate-core/src/test/resources/junit-platform.properties b/hibernate-core/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..54ed866612
--- /dev/null
+++ b/hibernate-core/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+junit.jupiter.testclass.order.default=org.junit.jupiter.api.ClassOrderer$ClassName
\ No newline at end of file