diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index ef434006e..bc2d2f3a8 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -71,9 +71,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.avaje.composite</groupId>
+      <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.1</version>
+      <version>1.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java b/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java
index b8586e3da..c76eda519 100644
--- a/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java
+++ b/ebean-externalmapping-xml/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.xmlmapping.model;
 
 import io.ebeaninternal.xmlmapping.XmlMappingReader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class XmlMappingReaderTest {
 
diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java
index 86e40ee86..30a7c82a2 100644
--- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java
+++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedDtoQueryTest.java
@@ -1,7 +1,7 @@
 package org.tests.model.basic.test;
 
 import io.ebean.DB;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.CustDto;
 import org.tests.model.basic.Customer;
 
diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java
index 61776857f..442f40269 100644
--- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java
+++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/NamedLocalAndExternalTest.java
@@ -3,7 +3,7 @@ package org.tests.model.basic.test;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.Query;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java
index 578c4a6d3..f28f01fb9 100644
--- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java
+++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/OrderAggregateNamedRawSqlTest.java
@@ -3,7 +3,7 @@ package org.tests.model.basic.test;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.assertj.core.api.AbstractCharSequenceAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.OrderAggregate;
 
 public class OrderAggregateNamedRawSqlTest {
diff --git a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java
index 96667bb22..0e9350dc0 100644
--- a/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java
+++ b/ebean-externalmapping-xml/src/test/java/org/tests/model/basic/test/RawSqlOrmQueryTest.java
@@ -2,7 +2,7 @@ package org.tests.model.basic.test;
 
 import io.ebean.DB;
 import io.ebean.Query;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 
 import java.util.List;