diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index aeb6ef8..7ddb6ea 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -69,6 +69,10 @@
 		charstring mp_remote_ip := "127.0.0.1";
 		PortNumber mp_local_rtp_port_base := 10000;
 		PortNumber mp_local_osmux_port := 1985;
+
+		/* Whether to enable conn-timeout tests. Can be dropped completely and enabled unconditionally once new
+		 * version of osmo-mgw is released (current version: 1.5.0) */
+		boolean mp_enable_conn_timeout_test := true;
 	}
 
 	private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT {
@@ -91,7 +95,9 @@
 		f_vty_transceive(MGWVTY, "enable");
 
 		f_vty_enable_osmux(osmux_on);
-		f_vty_config(MGWVTY, "mgcp", "conn-timeout 0");
+		if (mp_enable_conn_timeout_test) {
+			f_vty_config(MGWVTY, "mgcp", "conn-timeout 0");
+		}
 	}
 
 	private function f_rtpem_init(inout RTP_Emulation_CT comp_ref, integer i)
@@ -2158,6 +2164,8 @@
 		execute(TC_amr_oa_oa_rtp_conversion());
 		execute(TC_amr_bwe_bwe_rtp_conversion());
 
-		execute(TC_conn_timeout());
+		if (mp_enable_conn_timeout_test) {
+			execute(TC_conn_timeout());
+		}
 	}
 }