diff --git a/ttcn3-epdg-test/EPDG_Tests.cfg b/ttcn3-epdg-test/EPDG_Tests.cfg
index 2a39b671..5dbcb4c1 100644
--- a/ttcn3-epdg-test/EPDG_Tests.cfg
+++ b/ttcn3-epdg-test/EPDG_Tests.cfg
@@ -16,6 +16,9 @@ EPDG_Tests.mp_gsup_remote_ip := "172.18.10.20"
 EPDG_Tests.mp_s6b_remote_ip := "172.18.10.20"
 EPDG_Tests.mp_s2b_remote_ip := "172.18.10.20"
 
+# Match (diameter_watchdog_timer/1000)*diameter_watchdog_config["okay"] in osmo-epdg.config:
+EPDG_Tests.mp_diam_watchdog_initial_wait_sec := 6;
+
 [MAIN_CONTROLLER]
 
 [EXECUTE]
diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config
index 0aa98076..8acdc4f7 100644
--- a/ttcn3-epdg-test/osmo-epdg.config
+++ b/ttcn3-epdg-test/osmo-epdg.config
@@ -10,6 +10,11 @@
    {diameter_remote_ip, "172.18.10.103"},
    {diameter_remote_port, 3868},
    {diameter_proto, sctp},
+   {diameter_connect_timer, 200},
+   {diameter_watchdog_timer, 6000},
+   {diameter_watchdog_config,
+    [{okay, 1},
+     {suspect, 1}]},
    {vendor_id, 0},
    {origin_host, "epdg.localdomain"},
    {origin_realm, "localdomain"},
@@ -18,6 +23,11 @@
    {dia_s6b_local_ip, "172.18.10.20"},
    {dia_s6b_local_port, 3869},
    {dia_s6b_proto, sctp},
+   {dia_s6b_connect_timer, 200},
+   {dia_s6b_watchdog_timer, 6000},
+   {dia_s6b_watchdog_config,
+   [{okay, 1},
+    {suspect, 1}]},
    {dia_s6b_vendor_id, 0},
    {dia_s6b_origin_host, "aaa.localdomain"},
    {dia_s6b_origin_realm, "localdomain"},