diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/fallback_indication/FallbackIndicationTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/fallback_indication/FallbackIndicationTest.java
index 342e783b5..7695ac47d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/fallback_indication/FallbackIndicationTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/fallback_indication/FallbackIndicationTest.java
@@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.jivesoftware.smack.packet.Message;
-import org.jivesoftware.smack.packet.MessageBuilder;
+import org.jivesoftware.smack.packet.StanzaBuilder;
 
 import org.jivesoftware.smackx.fallback_indication.element.FallbackIndicationElement;
 
@@ -30,11 +30,11 @@ public class FallbackIndicationTest {
 
     @Test
     public void testFallbackIndicationElementFromMessageTest() {
-        Message messageWithoutFallback = MessageBuilder.buildMessage()
+        Message messageWithoutFallback = StanzaBuilder.buildMessage()
                         .build();
         assertNull(FallbackIndicationElement.fromMessage(messageWithoutFallback));
 
-        Message messageWithFallback = MessageBuilder.buildMessage()
+        Message messageWithFallback = StanzaBuilder.buildMessage()
                         .addExtension(new FallbackIndicationElement())
                         .build();
         assertNotNull(FallbackIndicationElement.fromMessage(messageWithFallback));
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_fastening/MessageFasteningElementsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_fastening/MessageFasteningElementsTest.java
index 8228fccfb..7a36752da 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_fastening/MessageFasteningElementsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_fastening/MessageFasteningElementsTest.java
@@ -29,6 +29,7 @@ import java.util.Arrays;
 
 import org.jivesoftware.smack.packet.MessageBuilder;
 import org.jivesoftware.smack.packet.StandardExtensionElement;
+import org.jivesoftware.smack.packet.StanzaBuilder;
 import org.jivesoftware.smack.packet.StanzaFactory;
 import org.jivesoftware.smack.packet.id.StandardStanzaIdSource;
 import org.jivesoftware.smack.parsing.SmackParsingException;
@@ -166,10 +167,10 @@ public class MessageFasteningElementsTest {
 
     @Test
     public void hasFasteningElementTest() {
-        MessageBuilder messageBuilderWithFasteningElement = MessageBuilder.buildMessage()
+        MessageBuilder messageBuilderWithFasteningElement = StanzaBuilder.buildMessage()
                 .setBody("Hi!")
                 .addExtension(FasteningElement.builder().setOriginId("origin-id-1").build());
-        MessageBuilder messageBuilderWithoutFasteningElement = MessageBuilder.buildMessage()
+        MessageBuilder messageBuilderWithoutFasteningElement = StanzaBuilder.buildMessage()
                 .setBody("Ho!");
 
         assertTrue(FasteningElement.hasFasteningElement(messageBuilderWithFasteningElement));