diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 30a019e..c288adb 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -382,11 +382,17 @@
 	f_init_vty();
 	for (i := 0; i < lengthof(mp_nsconfig_sgsn); i := i+1) {
 		f_vty_transceive(GBPVTY, "nsvc nsei " & int2str(g_sgsn[i].cfg.nsei) & " force-unconfigured");
+	}
+	for (i := 0; i < lengthof(mp_nsconfig_pcu); i := i+1) {
+		f_vty_transceive(GBPVTY, "nsvc nsei " & int2str(g_pcu[i].cfg.nsei) & " force-unconfigured");
+		f_vty_transceive(GBPVTY, "delete-gbproxy-peer " & int2str(g_pcu[i].cfg.nsei) & " only-bvc");
+	}
+
+	for (i := 0; i < lengthof(mp_nsconfig_sgsn); i := i+1) {
 		f_init_gb_sgsn(g_sgsn[i], "GbProxy_Test", i);
 	}
 	f_sleep(4.0);
 	for (i := 0; i < lengthof(mp_nsconfig_pcu); i := i+1) {
-		f_vty_transceive(GBPVTY, "nsvc nsei " & int2str(g_pcu[i].cfg.nsei) & " force-unconfigured");
 		f_init_gb_pcu(g_pcu[i], "GbProxy_Test", i);
 	}