diff --git a/debezium-embedded/src/test/java/io/debezium/converters/AbstractCloudEventsConverterTest.java b/debezium-embedded/src/test/java/io/debezium/converters/AbstractCloudEventsConverterTest.java
index a75c255c2..c32d97374 100644
--- a/debezium-embedded/src/test/java/io/debezium/converters/AbstractCloudEventsConverterTest.java
+++ b/debezium-embedded/src/test/java/io/debezium/converters/AbstractCloudEventsConverterTest.java
@@ -22,7 +22,7 @@
 
 import io.debezium.config.Configuration;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.AbstractAsyncEngineConnectorTest;
 import io.debezium.jdbc.JdbcConnection;
 import io.debezium.transforms.outbox.EventRouter;
 
@@ -31,7 +31,7 @@
  *
  * @author Roman Kudryashov
  */
-public abstract class AbstractCloudEventsConverterTest<T extends SourceConnector> extends AbstractConnectorTest {
+public abstract class AbstractCloudEventsConverterTest<T extends SourceConnector> extends AbstractAsyncEngineConnectorTest {
 
     protected abstract Class<T> getConnectorClass();
 
diff --git a/debezium-embedded/src/test/java/io/debezium/pipeline/notification/AbstractNotificationsIT.java b/debezium-embedded/src/test/java/io/debezium/pipeline/notification/AbstractNotificationsIT.java
index c53597d1d..040b1d5af 100644
--- a/debezium-embedded/src/test/java/io/debezium/pipeline/notification/AbstractNotificationsIT.java
+++ b/debezium-embedded/src/test/java/io/debezium/pipeline/notification/AbstractNotificationsIT.java
@@ -46,12 +46,12 @@
 
 import io.debezium.config.CommonConnectorConfig;
 import io.debezium.config.Configuration;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.AbstractAsyncEngineConnectorTest;
 import io.debezium.junit.logging.LogInterceptor;
 import io.debezium.pipeline.notification.channels.SinkNotificationChannel;
 import io.debezium.pipeline.notification.channels.jmx.JmxNotificationChannelMXBean;
 
-public abstract class AbstractNotificationsIT<T extends SourceConnector> extends AbstractConnectorTest {
+public abstract class AbstractNotificationsIT<T extends SourceConnector> extends AbstractAsyncEngineConnectorTest {
 
     protected abstract Class<T> connectorClass();
 
diff --git a/debezium-embedded/src/test/java/io/debezium/pipeline/source/snapshot/incremental/AbstractSnapshotTest.java b/debezium-embedded/src/test/java/io/debezium/pipeline/source/snapshot/incremental/AbstractSnapshotTest.java
index 6be5f749b..9011c32dd 100644
--- a/debezium-embedded/src/test/java/io/debezium/pipeline/source/snapshot/incremental/AbstractSnapshotTest.java
+++ b/debezium-embedded/src/test/java/io/debezium/pipeline/source/snapshot/incremental/AbstractSnapshotTest.java
@@ -24,13 +24,13 @@
 import org.apache.kafka.connect.source.SourceRecord;
 
 import io.debezium.config.Configuration;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.AbstractAsyncEngineConnectorTest;
 import io.debezium.engine.DebeziumEngine;
 import io.debezium.jdbc.JdbcConnection;
 import io.debezium.pipeline.signal.actions.AbstractSnapshotSignal;
 import io.debezium.util.Strings;
 
-public abstract class AbstractSnapshotTest<T extends SourceConnector> extends AbstractConnectorTest {
+public abstract class AbstractSnapshotTest<T extends SourceConnector> extends AbstractAsyncEngineConnectorTest {
 
     protected static final int ROW_COUNT = 1000;
     protected static final Path SCHEMA_HISTORY_PATH = Files.createTestingPath("file-schema-history-is.txt")
diff --git a/debezium-embedded/src/test/java/io/debezium/processors/AbstractReselectProcessorTest.java b/debezium-embedded/src/test/java/io/debezium/processors/AbstractReselectProcessorTest.java
index 485fdc2c4..18270034a 100644
--- a/debezium-embedded/src/test/java/io/debezium/processors/AbstractReselectProcessorTest.java
+++ b/debezium-embedded/src/test/java/io/debezium/processors/AbstractReselectProcessorTest.java
@@ -20,7 +20,7 @@
 import io.debezium.data.Envelope;
 import io.debezium.data.VerifyRecord;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.AbstractAsyncEngineConnectorTest;
 import io.debezium.jdbc.JdbcConnection;
 import io.debezium.junit.logging.LogInterceptor;
 import io.debezium.processors.reselect.ReselectColumnsPostProcessor;
@@ -30,7 +30,7 @@
 /**
  * @author Chris Cranford
  */
-public abstract class AbstractReselectProcessorTest<T extends SourceConnector> extends AbstractConnectorTest {
+public abstract class AbstractReselectProcessorTest<T extends SourceConnector> extends AbstractAsyncEngineConnectorTest {
 
     protected abstract Class<T> getConnectorClass();