diff --git a/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/CdcMysqlSourceWithSpecialDbNameTest.java b/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/CdcMysqlSourceWithSpecialDbNameTest.java
index 06c30176b4705..9dd4170500eca 100644
--- a/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/CdcMysqlSourceWithSpecialDbNameTest.java
+++ b/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/CdcMysqlSourceWithSpecialDbNameTest.java
@@ -6,15 +6,34 @@
 
 import io.airbyte.integrations.source.mysql.MySQLTestDatabase.BaseImage;
 import io.airbyte.integrations.source.mysql.MySQLTestDatabase.ContainerModifier;
+import org.testcontainers.containers.MySQLContainer;
 
 public class CdcMysqlSourceWithSpecialDbNameTest extends CdcMysqlSourceTest {
 
-  public static final String INVALID_DB_NAME = "invalid@name";
-
   @Override
   protected MySQLTestDatabase createTestDatabase() {
-    return MySQLTestDatabase.inWithDbName(BaseImage.MYSQL_8, INVALID_DB_NAME, ContainerModifier.INVALID_TIMEZONE_CEST, ContainerModifier.CUSTOM_NAME)
+    var container = new MySQLContainerFactory().shared(
+        BaseImage.MYSQL_8.reference,
+        ContainerModifier.INVALID_TIMEZONE_CEST.methodName,
+        ContainerModifier.CUSTOM_NAME.methodName);
+    return new TestDatabaseWithInvalidDatabaseName(container)
+        .initialized()
         .withCdcPermissions();
   }
 
+  static class TestDatabaseWithInvalidDatabaseName extends MySQLTestDatabase {
+
+    public static final String INVALID_DB_NAME = "invalid@name";
+
+    public TestDatabaseWithInvalidDatabaseName(MySQLContainer<?> container) {
+      super(container);
+    }
+
+    @Override
+    public String getDatabaseName() {
+      return INVALID_DB_NAME;
+    }
+
+  }
+
 }
diff --git a/airbyte-integrations/connectors/source-mysql/src/testFixtures/java/io/airbyte/integrations/source/mysql/MySQLTestDatabase.java b/airbyte-integrations/connectors/source-mysql/src/testFixtures/java/io/airbyte/integrations/source/mysql/MySQLTestDatabase.java
index 3e0b1511d5d0b..fc031ed541c79 100644
--- a/airbyte-integrations/connectors/source-mysql/src/testFixtures/java/io/airbyte/integrations/source/mysql/MySQLTestDatabase.java
+++ b/airbyte-integrations/connectors/source-mysql/src/testFixtures/java/io/airbyte/integrations/source/mysql/MySQLTestDatabase.java
@@ -54,15 +54,6 @@ static public MySQLTestDatabase in(BaseImage baseImage, ContainerModifier... met
     return new MySQLTestDatabase(container).initialized();
   }
 
-  static public MySQLTestDatabase inWithDbName(BaseImage baseImage, String dbName, ContainerModifier... methods) {
-    String[] methodNames = Stream.of(methods).map(im -> im.methodName).toList().toArray(new String[0]);
-    final var container = new MySQLContainerFactory().shared(baseImage.reference, methodNames);
-    MySQLTestDatabase db = new MySQLTestDatabase(container);
-    db.setDatabaseName(dbName);
-    db.initialized();
-    return db;
-  }
-
   public MySQLTestDatabase(MySQLContainer<?> container) {
     super(container);
   }
@@ -80,26 +71,6 @@ public MySQLTestDatabase withoutStrictMode() {
   }
 
   static private final int MAX_CONNECTIONS = 1000;
-  private String databaseName = "";
-
-  @Override
-  public String getDatabaseName() {
-    if (databaseName.isBlank()) {
-      return super.getDatabaseName();
-    } else {
-      return databaseName;
-    }
-  }
-
-  @Override
-  public void close() {
-    super.close();
-    databaseName = "";
-  }
-
-  public void setDatabaseName(final String databaseName) {
-    this.databaseName = databaseName;
-  }
 
   @Override
   protected Stream<Stream<String>> inContainerBootstrapCmd() {