diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 0d134f6..3b34c7f 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -995,7 +995,11 @@
 		/* Check if we can use valid link-local src addr.  */
 		var OCT16 saddr_ll := f_ipv6_link_local(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address);
 		f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_ll, dns1_addr));
-		f_wait_icmp6_echo_reply(ctx);
+		if (m_ggsn_impl == GGSN_IMPL_OSMOCOM) {
+			f_wait_icmp6_echo_reply(ctx);
+		} else {
+			f_wait_gtpu_fail(ctx);
+		}
 
 		/* Check that attempting RA with another ll src addr won't work, packet dropped: */
 		var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8);