diff --git a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerH2Test.java b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerH2Test.java
similarity index 89%
rename from client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerH2Test.java
rename to client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerH2Test.java
index 0f45cf1f73..86d331d8e4 100644
--- a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerH2Test.java
+++ b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerH2Test.java
@@ -1,6 +1,8 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
+import org.evomaster.client.java.sql.DbCleaner;
+import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerMariaDBTest.java b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerMariaDBTest.java
similarity index 95%
rename from client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerMariaDBTest.java
rename to client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerMariaDBTest.java
index c1155071e3..9a046be9a3 100644
--- a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerMariaDBTest.java
+++ b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerMariaDBTest.java
@@ -1,6 +1,7 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
+import org.evomaster.client.java.sql.DbCleaner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerMySQLTest.java b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerMySQLTest.java
similarity index 95%
rename from client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerMySQLTest.java
rename to client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerMySQLTest.java
index b64ab9a78b..6e63975ff9 100644
--- a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerMySQLTest.java
+++ b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerMySQLTest.java
@@ -1,7 +1,8 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
+import org.evomaster.client.java.sql.DbCleaner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerPostgresTest.java b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerPostgresTest.java
similarity index 93%
rename from client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerPostgresTest.java
rename to client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerPostgresTest.java
index 0737dd04e5..2cb69332a7 100644
--- a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerPostgresTest.java
+++ b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerPostgresTest.java
@@ -1,6 +1,8 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
+import org.evomaster.client.java.sql.DbCleaner;
+import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerSQLServerTest.java b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerSQLServerTest.java
similarity index 93%
rename from client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerSQLServerTest.java
rename to client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerSQLServerTest.java
index c32b1cb8d4..a452a91600 100644
--- a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerSQLServerTest.java
+++ b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerSQLServerTest.java
@@ -1,12 +1,15 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 //TODO
 //import org.evomaster.e2etests.utils.CIUtils;
 import org.evomaster.ci.utils.CIUtils;
+import org.evomaster.client.java.sql.DbCleaner;
+import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -17,6 +20,9 @@
 import java.util.HashMap;
 import java.util.List;
 
+//No longer support MSSQL
+@Deprecated
+@Disabled
 public class DbCleanerSQLServerTest extends DbCleanerTestBase{
 
     private static final int PORT = 1433;
diff --git a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerSQLServerWithSchemaTest.java b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerSQLServerWithSchemaTest.java
similarity index 95%
rename from client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerSQLServerWithSchemaTest.java
rename to client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerSQLServerWithSchemaTest.java
index e9e40b8d69..0dd838c7d0 100644
--- a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerSQLServerWithSchemaTest.java
+++ b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerSQLServerWithSchemaTest.java
@@ -1,10 +1,11 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.ci.utils.CIUtils;
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.sql.DbCleaner;
 import org.evomaster.client.java.sql.QueryResult;
 import org.evomaster.client.java.sql.SqlScriptRunner;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -16,6 +17,9 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+//No longer support MSSQL
+@Deprecated
+@Disabled
 public class DbCleanerSQLServerWithSchemaTest {
 
     private static final int PORT = 1433;
diff --git a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerTestBase.java b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerTestBase.java
similarity index 99%
rename from client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerTestBase.java
rename to client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerTestBase.java
index bfeafb0983..b819fb32e6 100644
--- a/client-java/sql/src/test/java/org/evomaster/client/java/sql/DbCleanerTestBase.java
+++ b/client-java/sql/src/test/java/org/evomaster/client/java/sql/cleaner/DbCleanerTestBase.java
@@ -1,4 +1,4 @@
-package org.evomaster.client.java.sql;
+package org.evomaster.client.java.sql.cleaner;
 
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.sql.QueryResult;