diff --git a/src/test/java/io/debezium/connector/db2/AbstractDb2DefaultValueIT.java b/src/test/java/io/debezium/connector/db2/AbstractDb2DefaultValueIT.java
index 5feaba8..8bebc85 100644
--- a/src/test/java/io/debezium/connector/db2/AbstractDb2DefaultValueIT.java
+++ b/src/test/java/io/debezium/connector/db2/AbstractDb2DefaultValueIT.java
@@ -27,7 +27,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.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.util.Testing;
 
 /**
@@ -39,7 +39,7 @@
  *
  * @author Chris Cranford
  */
-public abstract class AbstractDb2DefaultValueIT extends AbstractConnectorTest {
+public abstract class AbstractDb2DefaultValueIT extends AbstractAsyncEngineConnectorTest {
 
     private Db2Connection connection;
     private Configuration config;
diff --git a/src/test/java/io/debezium/connector/db2/DatatypesFromSnapshotIT.java b/src/test/java/io/debezium/connector/db2/DatatypesFromSnapshotIT.java
index 622d694..50c0ed5 100644
--- a/src/test/java/io/debezium/connector/db2/DatatypesFromSnapshotIT.java
+++ b/src/test/java/io/debezium/connector/db2/DatatypesFromSnapshotIT.java
@@ -19,7 +19,7 @@
 import io.debezium.connector.db2.Db2ConnectorConfig.SnapshotMode;
 import io.debezium.connector.db2.util.TestHelper;
 import io.debezium.data.VariableScaleDecimal;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.relational.RelationalDatabaseConnectorConfig.DecimalHandlingMode;
 import io.debezium.util.Testing;
 
@@ -28,7 +28,7 @@
  *
  * @author Jiri Pechanec
  */
-public class DatatypesFromSnapshotIT extends AbstractConnectorTest {
+public class DatatypesFromSnapshotIT extends AbstractAsyncEngineConnectorTest {
 
     private Db2Connection connection;
 
diff --git a/src/test/java/io/debezium/connector/db2/Db2CaseSensitiveObjectIT.java b/src/test/java/io/debezium/connector/db2/Db2CaseSensitiveObjectIT.java
index 24a9d86..4a51848 100644
--- a/src/test/java/io/debezium/connector/db2/Db2CaseSensitiveObjectIT.java
+++ b/src/test/java/io/debezium/connector/db2/Db2CaseSensitiveObjectIT.java
@@ -19,7 +19,7 @@
 import io.debezium.connector.db2.Db2ConnectorConfig.SnapshotMode;
 import io.debezium.connector.db2.util.TestHelper;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.util.Testing;
 
 /**
@@ -27,7 +27,7 @@
  *
  * @author Luis Garcés-Erice
  */
-public class Db2CaseSensitiveObjectIT extends AbstractConnectorTest {
+public class Db2CaseSensitiveObjectIT extends AbstractAsyncEngineConnectorTest {
 
     private Db2Connection connection;
 
diff --git a/src/test/java/io/debezium/connector/db2/Db2ConnectorIT.java b/src/test/java/io/debezium/connector/db2/Db2ConnectorIT.java
index c4ba09c..e534591 100644
--- a/src/test/java/io/debezium/connector/db2/Db2ConnectorIT.java
+++ b/src/test/java/io/debezium/connector/db2/Db2ConnectorIT.java
@@ -40,7 +40,7 @@
 import io.debezium.data.SchemaAndValueField;
 import io.debezium.data.VerifyRecord;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.junit.ConditionalFail;
 import io.debezium.junit.Flaky;
 import io.debezium.junit.logging.LogInterceptor;
@@ -56,7 +56,7 @@
  *
  * @author Jiri Pechanec, Luis Garcés-Erice, Peter Urbanetz
  */
-public class Db2ConnectorIT extends AbstractConnectorTest {
+public class Db2ConnectorIT extends AbstractAsyncEngineConnectorTest {
 
     private Db2Connection connection;
 
diff --git a/src/test/java/io/debezium/connector/db2/SchemaHistoryTopicIT.java b/src/test/java/io/debezium/connector/db2/SchemaHistoryTopicIT.java
index f72f2d9..670bef1 100644
--- a/src/test/java/io/debezium/connector/db2/SchemaHistoryTopicIT.java
+++ b/src/test/java/io/debezium/connector/db2/SchemaHistoryTopicIT.java
@@ -23,7 +23,7 @@
 import io.debezium.connector.db2.Db2ConnectorConfig.SnapshotMode;
 import io.debezium.connector.db2.util.TestHelper;
 import io.debezium.doc.FixFor;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.util.Testing;
 
 /**
@@ -34,7 +34,7 @@
  *
  * @author Jiri Pechanec
  */
-public class SchemaHistoryTopicIT extends AbstractConnectorTest {
+public class SchemaHistoryTopicIT extends AbstractAsyncEngineConnectorTest {
 
     private Db2Connection connection;
 
diff --git a/src/test/java/io/debezium/connector/db2/TransactionMetadataIT.java b/src/test/java/io/debezium/connector/db2/TransactionMetadataIT.java
index 034cae9..7cee023 100644
--- a/src/test/java/io/debezium/connector/db2/TransactionMetadataIT.java
+++ b/src/test/java/io/debezium/connector/db2/TransactionMetadataIT.java
@@ -18,7 +18,7 @@
 import io.debezium.config.Configuration;
 import io.debezium.connector.db2.Db2ConnectorConfig.SnapshotMode;
 import io.debezium.connector.db2.util.TestHelper;
-import io.debezium.embedded.AbstractConnectorTest;
+import io.debezium.embedded.async.AbstractAsyncEngineConnectorTest;
 import io.debezium.util.Collect;
 import io.debezium.util.Testing;
 
@@ -27,7 +27,7 @@
  *
  * @author Jiri Pechanec
  */
-public class TransactionMetadataIT extends AbstractConnectorTest {
+public class TransactionMetadataIT extends AbstractAsyncEngineConnectorTest {
 
     private Db2Connection connection;