diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index cb37ee7b..40b8e2c8 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -14,7 +14,6 @@
 [MODULE_PARAMETERS]
 PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"
 PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10"
-PCU_Tests.mp_ctrl_neigh_ip := "172.18.13.10";
 SGSN_Components.mp_nsconfig := {
 	nsei := 1234,
 	handle_sns := false,
@@ -36,8 +35,6 @@ SGSN_Components.mp_nsconfig := {
 	}
 }
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU";
-PCUIF_Components.mp_send_all_data_ind := true;
-PCU_Tests.mp_osmo_pcu_newer_than_0_9_0 := true;
 
 [MAIN_CONTROLLER]
 
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index 0bbfb315..11c77add 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -16,22 +16,9 @@ mkdir $VOL_BASE_DIR/pcu-tester
 mkdir $VOL_BASE_DIR/pcu-tester/unix
 cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/
 
-# Disable until osmo-pcu release > 0.9.0
-if image_suffix_is_latest; then
-	cfg="$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg"
-	sed -i "s/^PCUIF_Components.mp_send_all_data_ind.*/PCUIF_Components.mp_send_all_data_ind := false;/" "$cfg"
-	sed -i "s/^PCU_Tests.mp_osmo_pcu_newer_than_0_9_0.*/PCU_Tests.mp_osmo_pcu_newer_than_0_9_0 := false;/" "$cfg"
-else
-	sed "/PCU_Tests.mp_ctrl_neigh_ip/d" -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg"
-fi
-
 mkdir $VOL_BASE_DIR/pcu
 mkdir $VOL_BASE_DIR/pcu/unix
 cp osmo-pcu.cfg $VOL_BASE_DIR/pcu/
-# Disable until osmo-pcu release > 0.9.0
-if image_suffix_is_master; then
-	sed "/neighbor resolution/d" -i "$VOL_BASE_DIR/pcu/osmo-pcu.cfg"
-fi
 
 mkdir $VOL_BASE_DIR/unix
 
diff --git a/ttcn3-pcu-test/osmo-pcu.cfg b/ttcn3-pcu-test/osmo-pcu.cfg
index 3d60d938..733cebeb 100644
--- a/ttcn3-pcu-test/osmo-pcu.cfg
+++ b/ttcn3-pcu-test/osmo-pcu.cfg
@@ -32,7 +32,6 @@ pcu
  alpha 0
  gamma 0
  pcu-socket /data/unix/pcu_bts
- neighbor resolution 172.18.13.10
  gsmtap-category dl-unknown
  gsmtap-category dl-dummy
  gsmtap-category dl-ctrl