diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 092026e3a..46cd1ac07 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -381,22 +381,6 @@ template PDU_ML3_NW_MS tr_PAGING_REQ1(template MobileIdentityLV mi1 := ?,
 	}
 }
 
-/* Template for receiving a Paging Request Type1 message with a given TMSI in the first mobile identity. */
-template MobileIdentityLV tr_PAGING_REQ1_MI1_TMSI(octetstring tmsi) := {
-	lengthIndicator := 5,
-	mobileIdentityV := {
-		typeOfIdentity := '100'B,
-		oddEvenInd_identity := {
-			tmsi_ptmsi := {
-				oddevenIndicator := '0'B,
-				fillerDigit := '1111'B,
-				octets := tmsi
-			}
-		}
-	}
-
-}
-
 template PDU_ML3_NW_MS tr_PAGING_REQ2(template TMSIP_TMSI_V mi1 := ?,
 				      template TMSIP_TMSI_V mi2 := ?,
 				      template MobileIdentityTLV mi3 := *) := {
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 1c2b2716e..7ef3d0ac6 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -222,7 +222,7 @@ function f_bssgp_establish() runs on BSSGP_Client_CT {
 	log("BSSGP successfully initialized");
 }
 
-function f_wait_paging_req_type1(hexstring expected_tmsi) runs on dummy_CT {
+function f_wait_paging_req_type1(template (present) MobileIdentityV mi) runs on dummy_CT {
 	var LAPDm_ph_data ph_data;
 	timer T := 5.0;
 
@@ -240,7 +240,7 @@ function f_wait_paging_req_type1(hexstring expected_tmsi) runs on dummy_CT {
 			repeat;
 		}
 
-		if (match(pdu, tr_PAGING_REQ1(tr_PAGING_REQ1_MI1_TMSI(hex2oct(expected_tmsi))))) {
+		if (match(pdu, tr_PAGING_REQ1(tr_MI_LV(mi)))) {
 			setverdict(pass);
 		} else {
 			repeat;
@@ -268,12 +268,12 @@ testcase TC_paging() runs on dummy_CT {
 	/*
 	TODO: Paging by IMSI does not work yet because osmo-pcu does not copy IMSI into paging requests.
 	BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi));
-	f_wait_paging_req_type1(hex2oct(g_mmctx.imsi));
+	f_wait_paging_req_type1(tr_MI_IMSI(g_mmctx.imsi));
 	*/
 
 	/* Page by TMSI */
 	BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi));
-	f_wait_paging_req_type1(tmsi_hex);
+	f_wait_paging_req_type1(t_MI_TMSI(hex2oct(tmsi_hex)));
 }
 
 /* Establish an UL TBF: Tune to ARFCN, send RACH, receive AGCH, enable TBF Rx */