diff --git a/spring-boot/line-bot-spring-boot-handler/src/test/java/com/linecorp/bot/spring/boot/handler/argument/MessageContentArgumentResolverTest.java b/spring-boot/line-bot-spring-boot-handler/src/test/java/com/linecorp/bot/spring/boot/handler/argument/MessageContentArgumentResolverTest.java
index 65a98347a..31c280706 100644
--- a/spring-boot/line-bot-spring-boot-handler/src/test/java/com/linecorp/bot/spring/boot/handler/argument/MessageContentArgumentResolverTest.java
+++ b/spring-boot/line-bot-spring-boot-handler/src/test/java/com/linecorp/bot/spring/boot/handler/argument/MessageContentArgumentResolverTest.java
@@ -36,7 +36,7 @@ void isSupported() {
                         null,
                         null,
                         null,
-                        new TextMessageContent("aaa", "bbb", null, null, null, null)
+                        new TextMessageContent.Builder("aaa", "bbb", null).build()
                 )
                         .build())).isTrue();
         assertThat(resolver.isSupported(
@@ -45,7 +45,7 @@ void isSupported() {
                         null,
                         null,
                         null,
-                        new ImageMessageContent("aaa", null, null, null)
+                        new ImageMessageContent.Builder("aaa", null, null).build()
                 )
                         .build())).isFalse();
         assertThat(resolver.isSupported(
@@ -56,7 +56,7 @@ void isSupported() {
     @Test
     void resolve() {
         var resolver = new MessageContentArgumentResolver(TextMessageContent.class);
-        TextMessageContent textMessageContent = new TextMessageContent("aaa", "bbb", null, null, null, null);
+        TextMessageContent textMessageContent = new TextMessageContent.Builder("aaa", "bbb", null).build();
         assertThat(resolver.resolve(
                 "AAAA", new MessageEvent.Builder(
                         null, null, null, null, textMessageContent
diff --git a/spring-boot/line-bot-spring-boot-handler/src/test/java/com/linecorp/bot/spring/boot/handler/support/EventTestUtil.java b/spring-boot/line-bot-spring-boot-handler/src/test/java/com/linecorp/bot/spring/boot/handler/support/EventTestUtil.java
index 7b1cae6d3..5db665288 100644
--- a/spring-boot/line-bot-spring-boot-handler/src/test/java/com/linecorp/bot/spring/boot/handler/support/EventTestUtil.java
+++ b/spring-boot/line-bot-spring-boot-handler/src/test/java/com/linecorp/bot/spring/boot/handler/support/EventTestUtil.java
@@ -35,14 +35,7 @@ public static MessageEvent createTextMessage(final String text) {
                 EventMode.ACTIVE,
                 "AAAAAAAAAAAAAA",
                 new DeliveryContext(false),
-                new TextMessageContent(
-                        "id",
-                        text,
-                        null,
-                        null,
-                        null,
-                        null
-                )
+                new TextMessageContent.Builder("id", text, null).build()
         )
                 .source(new UserSource("userId"))
                 .replyToken("replyToken")