diff --git a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java
index 2d240eabc..b117d47ae 100644
--- a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java
@@ -1,6 +1,5 @@
 package io.ebean.config;
 
-import io.ebean.config.UnderscoreNamingConvention;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java
index 012c7321e..ecda8089a 100644
--- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java
@@ -1,8 +1,5 @@
 package io.ebean.config.dbplatform;
 
-import io.ebean.config.dbplatform.DbPlatformTypeLookup;
-import io.ebean.config.dbplatform.DbType;
-import io.ebean.config.dbplatform.ExtraDbTypes;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java
index 4bbc46ef1..44f85c2ac 100644
--- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java
@@ -1,7 +1,5 @@
 package io.ebean.config.dbplatform;
 
-import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.config.dbplatform.DbPlatformTypeParser;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
index fe0c2f296..450749f96 100644
--- a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java
@@ -1,7 +1,6 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.config.PlatformConfig;
-import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import org.junit.jupiter.api.Test;
 
diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
index 72f44aa5d..47d8fa0dd 100644
--- a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java
@@ -1,7 +1,6 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.config.PlatformConfig;
-import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.oracle.Oracle11Platform;
 import io.ebean.config.dbplatform.oracle.Oracle12Platform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
index 5ab6a479d..b7b6d524f 100644
--- a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
+++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java
@@ -2,8 +2,6 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.Query;
 import io.ebean.config.PlatformConfig;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.junit.jupiter.api.Test;
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java
index 3faddba2d..b46714a99 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.rawsql;
 
 import io.ebean.RawSql;
 import io.ebean.RawSqlBuilder;
-import io.ebeaninternal.server.rawsql.SpiRawSql;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java
index 1d4cf2441..ef58b5b05 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.rawsql;
 
 import io.ebean.SqlRow;
-import io.ebeaninternal.server.rawsql.DRawSqlService;
 import org.junit.jupiter.api.Test;
 
 import java.sql.ResultSet;
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java
index 6379be4ff..55e31b620 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java
@@ -4,9 +4,6 @@ import io.ebean.OrderBy;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 public class PropertyTest {
 
   @Test
diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java
index 38ae7f3d8..82b17bb64 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java
@@ -7,7 +7,6 @@ import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class DatabasePlatformBaseTest extends BaseTestCase {
 
diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java
index 47f4f9552..d2eaec893 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java
@@ -8,7 +8,6 @@ import java.sql.ResultSet;
 import java.util.List;
 
 import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class SequenceBatchIdGeneratorTest {