diff --git a/apache-kafka-2/README.md b/apache-kafka-2/README.md
index c938e70f6b..4b96ff9417 100644
--- a/apache-kafka-2/README.md
+++ b/apache-kafka-2/README.md
@@ -8,10 +8,8 @@ You can build the project from the command line using: *mvn clean install*, or i
 ### Relevant Articles:
 - [Guide to Check if Apache Kafka Server Is Running](https://www.baeldung.com/apache-kafka-check-server-is-running)
 - [Add Custom Headers to a Kafka Message](https://www.baeldung.com/java-kafka-custom-headers)
-- [Get Last N Messages in Apache Kafka Topic](https://www.baeldung.com/java-apache-kafka-get-last-n-messages)
 - [Is a Key Required as Part of Sending Messages to Kafka?](https://www.baeldung.com/java-kafka-message-key)
 - [Read Data From the Beginning Using Kafka Consumer API](https://www.baeldung.com/java-kafka-consumer-api-read)
-- [Get Partition Count for a Topic in Kafka](https://www.baeldung.com/java-kafka-partition-count-topic)
 - [bootstrap-server in Kafka Configuration](https://www.baeldung.com/java-kafka-bootstrap-server)
 - [Introduction to Apache Kafka](https://www.baeldung.com/apache-kafka)
 - [Ensuring Message Ordering in Kafka: Strategies and Configurations](https://www.baeldung.com/kafka-message-ordering)
diff --git a/apache-kafka-3/README.md b/apache-kafka-3/README.md
index a2a99425f9..496bc3964d 100644
--- a/apache-kafka-3/README.md
+++ b/apache-kafka-3/README.md
@@ -7,4 +7,6 @@ You can build the project from the command line using: *mvn clean install*, or i
 
 ### Relevant Articles:
 - [Commit Offsets in Kafka](https://www.baeldung.com/kafka-commit-offsets)
+- [Get Last N Messages in Apache Kafka Topic](https://www.baeldung.com/java-apache-kafka-get-last-n-messages)
+- [Get Partition Count for a Topic in Kafka](https://www.baeldung.com/java-kafka-partition-count-topic)
 
diff --git a/apache-kafka-3/pom.xml b/apache-kafka-3/pom.xml
index ad51e1de44..f838c73d5e 100644
--- a/apache-kafka-3/pom.xml
+++ b/apache-kafka-3/pom.xml
@@ -34,11 +34,25 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.databind.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>kafka</artifactId>
+            <version>${testcontainers-kafka.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${testcontainers-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>
         <kafka.version>3.6.1</kafka.version>
         <jackson.databind.version>2.15.2</jackson.databind.version>
+        <testcontainers-kafka.version>1.19.3</testcontainers-kafka.version>
+        <testcontainers-jupiter.version>1.19.3</testcontainers-jupiter.version>
     </properties>
     <profiles>
         <profile>
diff --git a/apache-kafka-2/src/test/java/com/baeldung/kafka/KafaConsumeLastNMessagesLiveTest.java b/apache-kafka-3/src/test/java/com/baeldung/kafka/KafaConsumeLastNMessagesLiveTest.java
similarity index 100%
rename from apache-kafka-2/src/test/java/com/baeldung/kafka/KafaConsumeLastNMessagesLiveTest.java
rename to apache-kafka-3/src/test/java/com/baeldung/kafka/KafaConsumeLastNMessagesLiveTest.java
diff --git a/apache-kafka-2/src/test/java/com/baeldung/kafka/KafkaCountPartitionsLiveTest.java b/apache-kafka-3/src/test/java/com/baeldung/kafka/KafkaCountPartitionsLiveTest.java
similarity index 97%
rename from apache-kafka-2/src/test/java/com/baeldung/kafka/KafkaCountPartitionsLiveTest.java
rename to apache-kafka-3/src/test/java/com/baeldung/kafka/KafkaCountPartitionsLiveTest.java
index 49950f67b1..eb4a0427d8 100644
--- a/apache-kafka-2/src/test/java/com/baeldung/kafka/KafkaCountPartitionsLiveTest.java
+++ b/apache-kafka-3/src/test/java/com/baeldung/kafka/KafkaCountPartitionsLiveTest.java
@@ -18,7 +18,10 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 @Testcontainers