diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index f2945ebdd..675a08118 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -497,14 +497,16 @@ module RLCMAC_Templates {
 		}
 	}
 
-	template RlcmacDlBlock tr_RLCMAC_DATA_RRBP := {
+	template RlcmacDlBlock tr_RLCMAC_DATA_GPRS(template (present) boolean rrbp_valid := ?,
+						   template (present) MacRrbp rrbp := ?,
+						   template (present) uint3_t usf := ?) := {
 		data := {
 			mac_hdr := {
 				mac_hdr := {
 					payload_type := MAC_PT_RLC_DATA,
-					rrbp := ?,
-					rrbp_valid := true,
-					usf := ?
+					rrbp := rrbp,
+					rrbp_valid := rrbp_valid,
+					usf := usf
 				},
 				hdr_ext := ?
 			},
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index eff20f73a..3d194a991 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -686,7 +686,8 @@ runs on RAW_PCU_Test_CT {
 	var PCUIF_Message pcu_msg;
 	var uint32_t dl_fn;
 	var boolean is_egprs := false;
-	var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP;
+	/* FIXME: for some reason, this template expects blocks with 'rrbp_valid' flag set */
+	var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_GPRS(rrbp_valid := true);
 	dl_template.data.blocks := ?;
 
 	f_rx_rlcmac_dl_block(dl_block, dl_fn);