diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn
index 51d45ba..753f92e 100644
--- a/hlr/HLR_Tests.ttcn
+++ b/hlr/HLR_Tests.ttcn
@@ -91,7 +91,7 @@
 private altstep as_Tguard() runs on test_CT {
 	[] g_Tguard.timeout {
 		setverdict(fail, "g_Tguard timeout");
-		self.stop;
+		mtc.stop;
 	}
 }
 
@@ -131,7 +131,7 @@
 		[legacy] GSUP.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}) { }
 		[] T.timeout {
 			setverdict(fail, "No connection to GSUP Port");
-			self.stop;
+			mtc.stop;
 		}
 	}
 }
@@ -270,7 +270,7 @@
 	var charstring ret := f_vty_transceive_ret(pt, cmd);
 	if (not match(ret, exp_ret)) {
 		setverdict(fail, "Non-matching VTY response: ", ret);
-		self.stop;
+		mtc.stop;
 	}
 }
 
@@ -359,7 +359,7 @@
 	[] GSUP.receive { repeat; }
 	[] T.timeout {
 		setverdict(fail, "Timeout waiting for SAI response");
-		self.stop;
+		mtc.stop;
 		}
 	}
 	return ret;
@@ -405,7 +405,7 @@
 	[] GSUP.receive { repeat; }
 	[] T.timeout {
 		setverdict(fail, "Timeout waiting for UL response");
-		self.stop;
+		mtc.stop;
 		}
 	}
 	return ret;
@@ -443,7 +443,7 @@
 	[] GSUP.receive { repeat; }
 	[] T.timeout {
 		setverdict(fail, "Timeout waiting for PURGE response");
-		self.stop;
+		mtc.stop;
 		}
 	}
 	return ret;