diff --git a/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/SnapshotIsolationIT.java b/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/SnapshotIsolationIT.java
index c0791cd5357..1d50e8a71e9 100644
--- a/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/SnapshotIsolationIT.java
+++ b/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/SnapshotIsolationIT.java
@@ -24,12 +24,12 @@
 
 import io.debezium.config.Configuration;
 import io.debezium.data.SchemaAndValueField;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 
 /**
  * Integration test for {@link io.debezium.connector.postgresql.PostgresConnectorConfig.SNAPSHOT_ISOLATION_MODE}
  */
-public class SnapshotIsolationIT extends AbstractConnectorTest {
+public class SnapshotIsolationIT extends AbstractAsyncEngineConnectorTest {
 
     private static final String INSERT_STMT = "INSERT INTO s1.a (aa) VALUES (1);" +
             "INSERT INTO s2.a (aa) VALUES (2);" +
diff --git a/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/transforms/DecodeLogicalDecodingMessageContentTest.java b/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/transforms/DecodeLogicalDecodingMessageContentTest.java
index 1d4fca57a6f..53e21d3ff00 100644
--- a/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/transforms/DecodeLogicalDecodingMessageContentTest.java
+++ b/debezium-connector-postgres/src/test/java/io/debezium/connector/postgresql/transforms/DecodeLogicalDecodingMessageContentTest.java
@@ -37,7 +37,7 @@
 import io.debezium.connector.postgresql.junit.SkipWhenDecoderPluginNameIsNot;
 import io.debezium.data.Envelope;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.junit.SkipWhenDatabaseVersion;
 
 /**
@@ -45,7 +45,7 @@
  *
  * @author Roman Kudryashov
  */
-public class DecodeLogicalDecodingMessageContentTest extends AbstractConnectorTest {
+public class DecodeLogicalDecodingMessageContentTest extends AbstractAsyncEngineConnectorTest {
 
     @Rule
     public final TestRule skipName = new SkipTestDependingOnDecoderPluginNameRule();
diff --git a/debezium-embedded/src/test/java/io/debezium/pipeline/AbstractMetricsTest.java b/debezium-embedded/src/test/java/io/debezium/pipeline/AbstractMetricsTest.java
index 4cf631a42d9..37b8b236ff8 100644
--- a/debezium-embedded/src/test/java/io/debezium/pipeline/AbstractMetricsTest.java
+++ b/debezium-embedded/src/test/java/io/debezium/pipeline/AbstractMetricsTest.java
@@ -29,10 +29,10 @@
 import io.debezium.config.CommonConnectorConfig;
 import io.debezium.config.Configuration;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.util.Testing;
 
-public abstract class AbstractMetricsTest<T extends SourceConnector> extends AbstractConnectorTest {
+public abstract class AbstractMetricsTest<T extends SourceConnector> extends AbstractAsyncEngineConnectorTest {
 
     protected abstract Class<T> getConnectorClass();
 
diff --git a/debezium-embedded/src/test/java/io/debezium/relational/history/AbstractSchemaHistoryTest.java b/debezium-embedded/src/test/java/io/debezium/relational/history/AbstractSchemaHistoryTest.java
index baedd6439fa..e787ca60beb 100644
--- a/debezium-embedded/src/test/java/io/debezium/relational/history/AbstractSchemaHistoryTest.java
+++ b/debezium-embedded/src/test/java/io/debezium/relational/history/AbstractSchemaHistoryTest.java
@@ -15,7 +15,7 @@
 
 import io.debezium.config.Configuration;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.pipeline.spi.OffsetContext;
 import io.debezium.pipeline.spi.Offsets;
 import io.debezium.pipeline.spi.Partition;
@@ -28,7 +28,7 @@
  *
  * @author Chris Cranford
  */
-public abstract class AbstractSchemaHistoryTest extends AbstractConnectorTest {
+public abstract class AbstractSchemaHistoryTest extends AbstractAsyncEngineConnectorTest {
 
     private MemorySchemaHistory schemaHistory;
 
diff --git a/debezium-embedded/src/test/java/io/debezium/transforms/outbox/AbstractEventRouterTest.java b/debezium-embedded/src/test/java/io/debezium/transforms/outbox/AbstractEventRouterTest.java
index fbb33f53914..34c5c1dc21e 100644
--- a/debezium-embedded/src/test/java/io/debezium/transforms/outbox/AbstractEventRouterTest.java
+++ b/debezium-embedded/src/test/java/io/debezium/transforms/outbox/AbstractEventRouterTest.java
@@ -31,7 +31,7 @@
 
 import io.debezium.config.Configuration;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.jdbc.JdbcConnection;
 
 /**
@@ -39,7 +39,7 @@
  *
  * @author Chris Cranford
  */
-public abstract class AbstractEventRouterTest<T extends SourceConnector> extends AbstractConnectorTest {
+public abstract class AbstractEventRouterTest<T extends SourceConnector> extends AbstractAsyncEngineConnectorTest {
 
     protected EventRouter<SourceRecord> outboxEventRouter;
 
diff --git a/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/JdbcOffsetBackingStoreIT.java b/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/JdbcOffsetBackingStoreIT.java
index 3c36f87d0fd..bfa6faa9349 100644
--- a/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/JdbcOffsetBackingStoreIT.java
+++ b/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/JdbcOffsetBackingStoreIT.java
@@ -30,7 +30,7 @@
 import io.debezium.config.Configuration;
 import io.debezium.connector.mysql.MySqlConnector;
 import io.debezium.connector.mysql.MySqlConnectorConfig;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.jdbc.JdbcConfiguration;
 import io.debezium.jdbc.JdbcConnection;
 import io.debezium.junit.SkipWhenDatabaseVersion;
@@ -44,7 +44,7 @@
  * @author Kanthi Subramanian
  */
 @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, reason = "DDL uses fractional second data types, not supported until MySQL 5.6")
-public class JdbcOffsetBackingStoreIT extends AbstractConnectorTest {
+public class JdbcOffsetBackingStoreIT extends AbstractAsyncEngineConnectorTest {
     private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("schema-history.db").toAbsolutePath();
 
     private static final String USER = "debezium";
diff --git a/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/history/JdbcSchemaHistoryIT.java b/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/history/JdbcSchemaHistoryIT.java
index 922a9fcf63a..52918f7b1a9 100644
--- a/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/history/JdbcSchemaHistoryIT.java
+++ b/debezium-storage/debezium-storage-jdbc/src/test/java/io/debezium/storage/jdbc/history/JdbcSchemaHistoryIT.java
@@ -30,14 +30,14 @@
 import io.debezium.config.Configuration.Builder;
 import io.debezium.connector.mysql.MySqlConnector;
 import io.debezium.connector.mysql.MySqlConnectorConfig;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.jdbc.JdbcConfiguration;
 import io.debezium.jdbc.JdbcConnection;
 import io.debezium.relational.history.SchemaHistory;
 import io.debezium.storage.jdbc.offset.JdbcOffsetBackingStoreConfig;
 import io.debezium.util.Testing;
 
-public class JdbcSchemaHistoryIT extends AbstractConnectorTest {
+public class JdbcSchemaHistoryIT extends AbstractAsyncEngineConnectorTest {
 
     private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("schema-history.db").toAbsolutePath();