diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 40506dfa0..be0e565f2 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -14,6 +14,7 @@ module GGSN_Tests {
 
 	import from General_Types all;
 	import from Osmocom_Types all;
+	import from Misc_Helpers all;
 	import from IPL4asp_PortType all;
 	import from IPL4asp_Types all;
 	import from GTP_CodecPort all;
@@ -209,9 +210,13 @@ module GGSN_Tests {
 			repeat;
 		};
 		[not g_use_echo] GTPC.receive(tr_GTPC_PING(?)) {
-			setverdict(fail, "GTP Echo Req rceived but not enabled in VTY");
+			Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+						"GTP Echo Req rceived but not enabled in VTY");
+		};
+		[] T_default.timeout {
+			Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+						"pinpong T_default timeout");
 		};
-		[] T_default.timeout { setverdict(fail); };
 	}
 
 	/* 'internet' in DNS encoding */