diff --git a/testing/integration/cases/do_client_teardown.sh b/testing/integration/cases/do_client_teardown.sh
index b88943a..73422ba 100644
--- a/testing/integration/cases/do_client_teardown.sh
+++ b/testing/integration/cases/do_client_teardown.sh
@@ -9,7 +9,7 @@ DOWN_DELAY=2
 
 ORIG_LINKS=$(get_client_links)
 
-${XIRI_EXE} -X ${SSH_USER}@${REMOTE_IP} &
+${XIRI_EXE} -f 1 -X ${SSH_USER}@${REMOTE_IP} &
 XIRI_PID=${!}; sleep ${INIT_DELAY}
 NEW_LINKS=$(get_client_links)
 
diff --git a/testing/integration/cases/do_server_teardown.sh b/testing/integration/cases/do_server_teardown.sh
index 25a8141..b2764c4 100644
--- a/testing/integration/cases/do_server_teardown.sh
+++ b/testing/integration/cases/do_server_teardown.sh
@@ -8,7 +8,7 @@ DOWN_DELAY=10
 
 ORIG_LINKS=$(get_server_links)
 
-${XIRI_EXE} -f 1 -X ${SSH_USER}@${REMOTE_IP} &
+${XIRI_EXE} -f 2 -X ${SSH_USER}@${REMOTE_IP} &
 XIRI_PID=${!}; sleep ${INIT_DELAY}
 NEW_LINKS=$(get_server_links)
 
diff --git a/testing/integration/cases/run_with_dns_propagation.sh b/testing/integration/cases/run_with_dns_propagation.sh
index 6fd0ade..4625058 100644
--- a/testing/integration/cases/run_with_dns_propagation.sh
+++ b/testing/integration/cases/run_with_dns_propagation.sh
@@ -1,5 +1,5 @@
-INIT_DELAY=20
-DOWN_DELAY=20
+INIT_DELAY=15
+DOWN_DELAY=10
 
 ORIG_RESOLV_CONF=$(cat /etc/resolv.conf)
 warn "${ORIG_RESOLV_CONF}"
diff --git a/testing/integration/cases/run_with_route_discovery.sh b/testing/integration/cases/run_with_route_discovery.sh
index 09a1f91..65880f2 100644
--- a/testing/integration/cases/run_with_route_discovery.sh
+++ b/testing/integration/cases/run_with_route_discovery.sh
@@ -11,7 +11,7 @@ echo '#!/bin/sh' >${WD}/discover-routes
 echo "echo ROUTE:${MOCKED_ROUTE}" >>${WD}/discover-routes
 chmod +x ${WD}/discover-routes
 
-${XIRI_EXE} ${SSH_USER}@${REMOTE_IP} &
+${XIRI_EXE} -f 1 ${SSH_USER}@${REMOTE_IP} &
 XIRI_PID=${!}
 set +e
 wait_for true ${INIT_DELAY} "ip route | grep ${MOCKED_ROUTE}"
diff --git a/testing/integration/cases/run_without_dns_propagation.sh b/testing/integration/cases/run_without_dns_propagation.sh
index 3e77610..b175df7 100644
--- a/testing/integration/cases/run_without_dns_propagation.sh
+++ b/testing/integration/cases/run_without_dns_propagation.sh
@@ -1,10 +1,10 @@
-INIT_DELAY=20
-DOWN_DELAY=20
+INIT_DELAY=10
+DOWN_DELAY=10
 
 ORIG_RESOLV_CONF=$(cat /etc/resolv.conf)
 warn "${ORIG_RESOLV_CONF}"
 
-${XIRI_EXE} -X -D ${SSH_USER}@${REMOTE_IP} 10.245.245.245/32 &
+${XIRI_EXE} -f 2 -X -D ${SSH_USER}@${REMOTE_IP} 10.245.245.245/32 &
 XIRI_PID=${!}; sleep ${INIT_DELAY}
 
 NEW_RESOLV_CONF=$(cat /etc/resolv.conf)
diff --git a/testing/integration/cases/run_without_route_discovery.sh b/testing/integration/cases/run_without_route_discovery.sh
index e235982..7dad18c 100644
--- a/testing/integration/cases/run_without_route_discovery.sh
+++ b/testing/integration/cases/run_without_route_discovery.sh
@@ -8,7 +8,7 @@ if [[ -f ${WD}/discover-routes ]]; then
   mv ${WD}/discover-routes /tmp/discover-routes.orig
 fi
 
-${XIRI_EXE} -f 3 -X ${SSH_USER}@${REMOTE_IP} &
+${XIRI_EXE} -f 2 -X ${SSH_USER}@${REMOTE_IP} &
 XIRI_PID=${!}
 wait_for true ${INIT_DELAY} pgrep -f -- "-w.*${SSH_USER}@${REMOTE_IP}"
 
diff --git a/xiringuito b/xiringuito
index 3f58c25..c9bcacf 100755
--- a/xiringuito
+++ b/xiringuito
@@ -127,7 +127,7 @@ fi
 declare -r TUNNEL_ID=$(cat ${TUNNEL_ID_FILE})
 declare -r REMOTE_PATH="/tmp/xiringuito.${TUNNEL_ID}"
 
-declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-ERROR} -oConnectionAttempts=3 -oConnectTimeout=3 ${SSH_PRIVATE_KEY_OPTS} ${SSH_EXTRA_OPTS}"
+declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-ERROR} -oConnectionAttempts=3 -oConnectTimeout=5 ${SSH_PRIVATE_KEY_OPTS} ${SSH_EXTRA_OPTS}"
 
 if [[ ${KERNEL} == linux ]]; then
   declare -r LOCAL_TUNNEL_ID=${TUNNEL_ID}