diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 5ac8191..555aac8 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -62,7 +62,6 @@
 const integer NUM_TCHH_PER_BTS := 2;
 const integer NUM_TCHF_PER_BTS := 4;
 const integer NUM_SDCCH_PER_BTS := 4;
-template octetstring t_l3_rr_chan_rel := '060D??*'O;
 
 
 /* per-BTS state which we keep */
@@ -872,7 +871,7 @@
 		got_deact_sacch := true;
 		repeat;
 	}
-	[] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, t_l3_rr_chan_rel))) {
+	[] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) {
 		got_rr_chan_rel := true;
 		repeat;
 	}
@@ -2816,7 +2815,7 @@
 	[] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {
 			log("Got Deact SACCH");
 		}
-	[] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, t_l3_rr_chan_rel)) {
+	[] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE)) {
 			log("Got RR Release");
 		}
 	[] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn
index 0fada93..67ccecf 100644
--- a/bsc/BSC_Tests_LCLS.ttcn
+++ b/bsc/BSC_Tests_LCLS.ttcn
@@ -702,7 +702,7 @@
 	var myBSSMAP_Cause cause_val := GSM0808_CAUSE_CALL_CONTROL;
 	CONN_A.send(ts_BSSMAP_ClearCommand(enum2int(cause_val)));
 	interleave {
-	[] CONN_A.receive(tr_RSL_DATA_REQ(?, tr_RslLinkID_DCCH(0), t_l3_rr_chan_rel));
+	[] CONN_A.receive(tr_RSL_DATA_REQ(?, tr_RslLinkID_DCCH(0), decmatch tr_RRM_RR_RELEASE));
 	[] CONN_A.receive(tr_RSL_DEACT_SACCH(?));
 	[] CONN_A.receive(tr_RSL_RF_CHAN_REL(?)) -> value rsl {
 		var RSL_IE_Body ieb;
diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 3978498..0b714d3 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -660,6 +660,37 @@
 	}
 }
 
+template PDU_ML3_NW_MS tr_RRM_RR_RELEASE(template OCT1 cause := ?) := {
+	discriminator := '0110'B,
+	tiOrSkip := {
+		skipIndicator := '0000'B
+	},
+	msgs := {
+		rrm := {
+			channelRelease := {
+				messageType := '00001101'B,
+				rRCause := {
+					valuePart := cause
+				},
+				bARange := *,
+				groupChannelDescription := *,
+				groupCipherKeyNumber := *,
+				gPRSResumption := *,
+				bAListPref := *,
+				uTRANFrequencyList := *,
+				cellChannelDescr := *,
+				cellSelectionIndicator := *,
+				enhanced_DTM_CS_Release_Indication := *,
+				vGCS_Ciphering_Parameters := *,
+				group_Channel_Description_2 := *,
+				talkerIdentity := *,
+				talkerPriorityStatus := *,
+				vGCS_AMR_Configuration := *,
+				individual_Priorities := *
+			}
+		}
+	}
+}
 
 
 template PDU_ML3_MS_NW ts_ML3_MO := {