diff --git a/debezium-connector-binlog/src/test/java/io/debezium/connector/binlog/BinlogCustomSnapshotterIT.java b/debezium-connector-binlog/src/test/java/io/debezium/connector/binlog/BinlogCustomSnapshotterIT.java
index e3d02eb20..c4a01ceb2 100644
--- a/debezium-connector-binlog/src/test/java/io/debezium/connector/binlog/BinlogCustomSnapshotterIT.java
+++ b/debezium-connector-binlog/src/test/java/io/debezium/connector/binlog/BinlogCustomSnapshotterIT.java
@@ -98,8 +98,8 @@ record = s2recs.get(0);
 
         config = DATABASE_CUSTOM_SNAPSHOT.defaultConfig()
                 .with(BinlogConnectorConfig.SNAPSHOT_MODE, BinlogConnectorConfig.SnapshotMode.CUSTOM.getValue())
-                .with(BinlogConnectorConfig.SNAPSHOT_MODE_CUSTOM_NAME, BinlogConnectorConfig.class.getName())
-                .with(BinlogConnectorConfig.SNAPSHOT_QUERY_MODE, BinlogConnectorConfig.SnapshotQueryMode.CUSTOM)
+                .with(BinlogConnectorConfig.SNAPSHOT_MODE_CUSTOM_NAME, getCustomSnapshotClassName())
+                .with(BinlogConnectorConfig.SNAPSHOT_QUERY_MODE, CommonConnectorConfig.SnapshotQueryMode.CUSTOM)
                 .with(BinlogConnectorConfig.SNAPSHOT_QUERY_MODE_CUSTOM_NAME, getCustomSnapshotClassName())
                 .build();
 
diff --git a/debezium-connector-mariadb/src/test/java/io/debezium/connector/mariadb/CustomTestSnapshot.java b/debezium-connector-mariadb/src/test/java/io/debezium/connector/mariadb/CustomTestSnapshot.java
index f2d47830b..02ece666a 100644
--- a/debezium-connector-mariadb/src/test/java/io/debezium/connector/mariadb/CustomTestSnapshot.java
+++ b/debezium-connector-mariadb/src/test/java/io/debezium/connector/mariadb/CustomTestSnapshot.java
@@ -34,8 +34,8 @@ public String name() {
 
     @Override
     public void injectBeanRegistry(BeanRegistry beanRegistry) {
-        Offsets<MariaDbPartition, MariaDbOffsetContext> mySqlOffsetContext = beanRegistry.lookupByName(StandardBeanNames.OFFSETS, Offsets.class);
-        hasState = mySqlOffsetContext.getTheOnlyOffset() != null;
+        Offsets<MariaDbPartition, MariaDbOffsetContext> mariaDbOffsetContext = beanRegistry.lookupByName(StandardBeanNames.OFFSETS, Offsets.class);
+        hasState = mariaDbOffsetContext.getTheOnlyOffset() != null;
     }
 
     @Override