diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
index a83521d76..7c178d996 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebean.DB;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.common.BeanList;
@@ -9,7 +8,6 @@ import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
index e7cacbbe5..6563886dc 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
@@ -3,11 +3,8 @@ package io.ebeaninternal.server.querydefn;
 
 import io.ebean.*;
 import io.ebeaninternal.api.BindValuesKey;
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.core.DefaultServer;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.OrmQueryRequestTestHelper;
-import io.ebeaninternal.server.deploy.BaseTest;
 import io.ebeaninternal.server.expression.BaseExpressionTest;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index f0688082f..62d36a7bc 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>12.16.1</version>
+      <version>${ebean-migration.version}</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-test/src/test/java/io/ebean/xtest/expression/IsEmptyExpressionQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/expression/IsEmptyExpressionQueryTest.java
index 3227ca02e..f5c921c81 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/expression/IsEmptyExpressionQueryTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/expression/IsEmptyExpressionQueryTest.java
@@ -4,7 +4,6 @@ import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.test.LoggedSql;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;