diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 3369e37..88b8c1e 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -1442,7 +1442,9 @@
 		{name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0},
 		{name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0}
 	};
-	f_statsd_expect(expect);
+	if (f_osmo_repo_is("nightly")) {
+		f_statsd_expect(expect);
+	}
 
 	f_create_rab(pars.mgcp_pars);
 
@@ -1451,7 +1453,9 @@
 		{name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 1, max := 1},
 		{name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0}
 	};
-	f_statsd_expect(expect);
+	if (f_osmo_repo_is("nightly")) {
+		f_statsd_expect(expect);
+	}
 
 	/* Send Iu Release */
 	tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause));
@@ -1500,7 +1504,9 @@
 		{name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0},
 		{name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0}
 	};
-	f_statsd_expect(expect);
+	if (f_osmo_repo_is("nightly")) {
+		f_statsd_expect(expect);
+	}
 
 	f_rab_ass_req(pars.mgcp_pars);
 
@@ -1513,7 +1519,9 @@
 		{name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0},
 		{name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 1, max := 1}
 	};
-	f_statsd_expect(expect);
+	if (f_osmo_repo_is("nightly")) {
+		f_statsd_expect(expect);
+	}
 
 
 	T.start;
@@ -1563,7 +1571,9 @@
 	var StatsDExpects expect := {
 		{name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 0, max := 0}
 	};
-	f_statsd_expect(expect);
+	if (f_osmo_repo_is("nightly")) {
+		f_statsd_expect(expect);
+	}
 
 	/* Send RAB Release */
 	tx := valueof(ts_RANAP_RabAssReq(rab_rl := ts_RAB_RL(t_RAB_id(23), pars.rab_rel_cause)));
@@ -1572,7 +1582,9 @@
 	expect := {
 		{name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 1, max := 1}
 	};
-	f_statsd_expect(expect);
+	if (f_osmo_repo_is("nightly")) {
+		f_statsd_expect(expect);
+	}
 
 	T.start;