diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index 73591b2..0cedb0e 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -2562,7 +2562,7 @@
 
 		f_init(ep);
 		log("Setting conn-timeout to 1s");
-		f_vty_config(MGWVTY, "mgcp", "conn-timeout 1"); /* reset in f_init_vty() */
+		f_vty_config(MGWVTY, "mgcp", "conn-timeout 1");
 
 		log("Sending RTP data for 1.5s");
 		flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1"));
@@ -2587,6 +2587,9 @@
 		f_sleep(0.2);
 		f_rtpem_conn_refuse_verify(RTPEM[0]);
 
+		log("Setting conn-timeout back to 0 (disabled)");
+		f_vty_config(MGWVTY, "mgcp", "conn-timeout 0");
+
 		setverdict(pass);
 	}