diff --git a/tests/common/context.c b/tests/common/context.c
index f65893cb5..628d29406 100644
--- a/tests/common/context.c
+++ b/tests/common/context.c
@@ -44,10 +44,16 @@ void test_context_init(void)
     rv = ogs_getaddrinfo(&test_self()->gnb1_addr, AF_UNSPEC,
             "127.0.0.2", OGS_GTPV1_U_UDP_PORT, 0);
     ogs_assert(rv == OGS_OK);
+    rv = ogs_getaddrinfo(&test_self()->gnb1_addr6, AF_UNSPEC,
+            "fd69:f21d:873c:fa::2", OGS_GTPV1_U_UDP_PORT, 0);
+    ogs_assert(rv == OGS_OK);
 
     rv = ogs_getaddrinfo(&test_self()->gnb2_addr, AF_UNSPEC,
             "127.0.0.3", OGS_GTPV1_U_UDP_PORT, 0);
     ogs_assert(rv == OGS_OK);
+    rv = ogs_getaddrinfo(&test_self()->gnb2_addr6, AF_UNSPEC,
+            "fd69:f21d:873c:fa::3", OGS_GTPV1_U_UDP_PORT, 0);
+    ogs_assert(rv == OGS_OK);
 
     context_initialized = 1;
 }
@@ -63,7 +69,9 @@ void test_context_final(void)
     ogs_socknode_remove_all(&self.s1ap_list6);
 
     ogs_freeaddrinfo(test_self()->gnb1_addr);
+    ogs_freeaddrinfo(test_self()->gnb1_addr6);
     ogs_freeaddrinfo(test_self()->gnb2_addr);
+    ogs_freeaddrinfo(test_self()->gnb2_addr6);
 
     ogs_pool_final(&test_ue_pool);
     ogs_pool_final(&test_bearer_pool);
diff --git a/tests/common/gtpu.c b/tests/common/gtpu.c
index 4661ac821..bb2264eb6 100644
--- a/tests/common/gtpu.c
+++ b/tests/common/gtpu.c
@@ -195,6 +195,10 @@ int test_gtpu_send(
         if (sess->upf_n3_ip.ipv4) {
             gnode.addr.ogs_sa_family = AF_INET;
             gnode.addr.sin.sin_addr.s_addr = sess->upf_n3_ip.addr;
+        } else if (sess->upf_n3_ip.ipv6) {
+            gnode.addr.ogs_sa_family = AF_INET6;
+            memcpy(gnode.addr.sin6.sin6_addr.s6_addr,
+                    sess->upf_n3_ip.addr6, OGS_IPV6_LEN);
         } else {
             ogs_fatal("Not implemented");
             ogs_assert_if_reached();
@@ -204,6 +208,10 @@ int test_gtpu_send(
         if (bearer->sgw_s1u_ip.ipv4) {
             gnode.addr.ogs_sa_family = AF_INET;
             gnode.addr.sin.sin_addr.s_addr = bearer->sgw_s1u_ip.addr;
+        } else if (bearer->sgw_s1u_ip.ipv6) {
+            gnode.addr.ogs_sa_family = AF_INET6;
+            memcpy(gnode.addr.sin6.sin6_addr.s6_addr,
+                    bearer->sgw_s1u_ip.addr6, OGS_IPV6_LEN);
         } else {
             ogs_fatal("Not implemented");
             ogs_assert_if_reached();