diff --git a/test/TEST-20-NFS/server-init.sh b/test/TEST-20-NFS/server-init.sh
index 59b140e0..846bbfd8 100755
--- a/test/TEST-20-NFS/server-init.sh
+++ b/test/TEST-20-NFS/server-init.sh
@@ -14,6 +14,22 @@ wait_for_if_link() {
     local li
     while [ $cnt -lt 600 ]; do
         li=$(ip -o link show dev $1 2>/dev/null)
+	[ -n "$li" ] && return 0
+        if [[ $2 ]]; then
+	    li=$(ip -o link show dev $2 2>/dev/null)
+	    [ -n "$li" ] && return 0
+        fi
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+wait_for_if_up() {
+    local cnt=0
+    local li
+    while [ $cnt -lt 200 ]; do
+        li=$(ip -o link show up dev $1)
         [ -n "$li" ] && return 0
         sleep 0.1
         cnt=$(($cnt+1))
@@ -21,7 +37,24 @@ wait_for_if_link() {
     return 1
 }
 
-wait_for_if_link eth0
+wait_for_route_ok() {
+    local cnt=0
+    while [ $cnt -lt 200 ]; do
+        li=$(ip route show)
+        [ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+linkup() {
+    wait_for_if_link $1 2>/dev/null\
+     && ip link set $1 up 2>/dev/null\
+     && wait_for_if_up $1 2>/dev/null
+}
+
+wait_for_if_link eth0 ens3
 
 ip addr add 127.0.0.1/8 dev lo
 ip link set lo up
@@ -29,7 +62,8 @@ ip link set dev eth0 name ens3
 ip addr add 192.168.50.1/24 dev ens3
 ip addr add 192.168.50.2/24 dev ens3
 ip addr add 192.168.50.3/24 dev ens3
-ip link set ens3 up
+linkup ens3
+
 echo > /dev/watchdog
 modprobe af_packet
 echo > /dev/watchdog
diff --git a/test/TEST-30-ISCSI/server-init.sh b/test/TEST-30-ISCSI/server-init.sh
index 2258fc36..320303e9 100755
--- a/test/TEST-30-ISCSI/server-init.sh
+++ b/test/TEST-30-ISCSI/server-init.sh
@@ -3,7 +3,7 @@ exec </dev/console >/dev/console 2>&1
 set -x
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 export TERM=linux
-export PS1='nfstest-server:\w\$ '
+export PS1='server:\w\$ '
 stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
@@ -13,15 +13,19 @@ wait_for_if_link() {
     local li
     while [ $cnt -lt 600 ]; do
         li=$(ip -o link show dev $1 2>/dev/null)
-        [ -n "$li" ] && return 0
+	[ -n "$li" ] && return 0
+        if [[ $2 ]]; then
+	    li=$(ip -o link show dev $2 2>/dev/null)
+	    [ -n "$li" ] && return 0
+        fi
         sleep 0.1
         cnt=$(($cnt+1))
     done
     return 1
 }
 
-wait_for_if_link eth0
-wait_for_if_link eth1
+wait_for_if_link eth0 ens3
+wait_for_if_link eth1 ens4
 
 ip addr add 127.0.0.1/8 dev lo
 ip link set lo up
@@ -48,8 +52,8 @@ tgtadm --lld iscsi --mode target --op bind --tid 3 -I 192.168.50.101
 
 
 # Wait forever for the VM to die
-echo "Serving iSCSI"
 while :; do
+	echo "Serving iSCSI"
 	[ -n "$(jobs -rp)" ] && echo > /dev/watchdog
 	sleep 10
 done
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index 6e3613a6..7424d105 100755
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -38,6 +38,7 @@ run_server() {
         echo "Waiting for the server to startup"
         while : ; do
             grep Serving "$TESTDIR"/server.log && break
+            echo "Waiting for the server to startup"
             sleep 1
         done
     else
diff --git a/test/TEST-31-ISCSI-MULTI/server-init.sh b/test/TEST-31-ISCSI-MULTI/server-init.sh
index 2258fc36..d825e3a7 100755
--- a/test/TEST-31-ISCSI-MULTI/server-init.sh
+++ b/test/TEST-31-ISCSI-MULTI/server-init.sh
@@ -3,7 +3,7 @@ exec </dev/console >/dev/console 2>&1
 set -x
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 export TERM=linux
-export PS1='nfstest-server:\w\$ '
+export PS1='server:\w\$ '
 stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
@@ -13,6 +13,22 @@ wait_for_if_link() {
     local li
     while [ $cnt -lt 600 ]; do
         li=$(ip -o link show dev $1 2>/dev/null)
+	[ -n "$li" ] && return 0
+        if [[ $2 ]]; then
+	    li=$(ip -o link show dev $2 2>/dev/null)
+	    [ -n "$li" ] && return 0
+        fi
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+wait_for_if_up() {
+    local cnt=0
+    local li
+    while [ $cnt -lt 200 ]; do
+        li=$(ip -o link show up dev $1)
         [ -n "$li" ] && return 0
         sleep 0.1
         cnt=$(($cnt+1))
@@ -20,17 +36,35 @@ wait_for_if_link() {
     return 1
 }
 
-wait_for_if_link eth0
-wait_for_if_link eth1
+wait_for_route_ok() {
+    local cnt=0
+    while [ $cnt -lt 200 ]; do
+        li=$(ip route show)
+        [ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+linkup() {
+    wait_for_if_link $1 2>/dev/null\
+     && ip link set $1 up 2>/dev/null\
+     && wait_for_if_up $1 2>/dev/null
+}
+
+wait_for_if_link eth0 ens3
+wait_for_if_link eth1 ens4
 
 ip addr add 127.0.0.1/8 dev lo
 ip link set lo up
 ip link set dev eth0 name ens3
 ip addr add 192.168.50.1/24 dev ens3
-ip link set ens3 up
+linkup ens3
 ip link set dev eth1 name ens4
 ip addr add 192.168.51.1/24 dev ens4
-ip link set ens4 up
+linkup ens4
+
 >/var/lib/dhcpd/dhcpd.leases
 chmod 777 /var/lib/dhcpd/dhcpd.leases
 dhcpd -d -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases &
diff --git a/test/TEST-40-NBD/server-init.sh b/test/TEST-40-NBD/server-init.sh
index 63755b26..ea1f153f 100755
--- a/test/TEST-40-NBD/server-init.sh
+++ b/test/TEST-40-NBD/server-init.sh
@@ -13,6 +13,22 @@ wait_for_if_link() {
     local li
     while [ $cnt -lt 600 ]; do
         li=$(ip -o link show dev $1 2>/dev/null)
+	[ -n "$li" ] && return 0
+        if [[ $2 ]]; then
+	    li=$(ip -o link show dev $2 2>/dev/null)
+	    [ -n "$li" ] && return 0
+        fi
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+wait_for_if_up() {
+    local cnt=0
+    local li
+    while [ $cnt -lt 200 ]; do
+        li=$(ip -o link show up dev $1)
         [ -n "$li" ] && return 0
         sleep 0.1
         cnt=$(($cnt+1))
@@ -20,13 +36,31 @@ wait_for_if_link() {
     return 1
 }
 
-wait_for_if_link eth0
+wait_for_route_ok() {
+    local cnt=0
+    while [ $cnt -lt 200 ]; do
+        li=$(ip route show)
+        [ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
+        sleep 0.1
+        cnt=$(($cnt+1))
+    done
+    return 1
+}
+
+linkup() {
+    wait_for_if_link $1 2>/dev/null\
+     && ip link set $1 up 2>/dev/null\
+     && wait_for_if_up $1 2>/dev/null
+}
+
+wait_for_if_link eth0 ens3
 
 ip addr add 127.0.0.1/8 dev lo
 ip link set lo up
 ip link set dev eth0 name ens3
 ip addr add 192.168.50.1/24 dev ens3
-ip link set ens3 up
+linkup ens3
+
 modprobe af_packet
 nbd-server
 >/var/lib/dhcpd/dhcpd.leases
diff --git a/test/TEST-50-MULTINIC/server-init.sh b/test/TEST-50-MULTINIC/server-init.sh
index ed84c5b4..ccabc830 100755
--- a/test/TEST-50-MULTINIC/server-init.sh
+++ b/test/TEST-50-MULTINIC/server-init.sh
@@ -13,7 +13,11 @@ wait_for_if_link() {
     local li
     while [ $cnt -lt 600 ]; do
         li=$(ip -o link show dev $1 2>/dev/null)
-        [ -n "$li" ] && return 0
+	[ -n "$li" ] && return 0
+        if [[ $2 ]]; then
+	    li=$(ip -o link show dev $2 2>/dev/null)
+	    [ -n "$li" ] && return 0
+        fi
         sleep 0.1
         cnt=$(($cnt+1))
     done
@@ -49,7 +53,7 @@ linkup() {
      && wait_for_if_up $1 2>/dev/null
 }
 
-wait_for_if_link eth0
+wait_for_if_link eth0 ens3
 
 >/dev/watchdog
 ip addr add 127.0.0.1/8 dev lo
@@ -57,6 +61,7 @@ linkup lo
 ip link set dev eth0 name ens3
 ip addr add 192.168.50.1/24 dev ens3
 linkup ens3
+
 >/dev/watchdog
 modprobe af_packet
 > /dev/watchdog
diff --git a/test/TEST-60-IFCFG/server-init.sh b/test/TEST-60-IFCFG/server-init.sh
index cff29a3b..69fad5dc 100755
--- a/test/TEST-60-IFCFG/server-init.sh
+++ b/test/TEST-60-IFCFG/server-init.sh
@@ -13,7 +13,11 @@ wait_for_if_link() {
     local li
     while [ $cnt -lt 600 ]; do
         li=$(ip -o link show dev $1 2>/dev/null)
-        [ -n "$li" ] && return 0
+	[ -n "$li" ] && return 0
+        if [[ $2 ]]; then
+	    li=$(ip -o link show dev $2 2>/dev/null)
+	    [ -n "$li" ] && return 0
+        fi
         sleep 0.1
         cnt=$(($cnt+1))
     done
@@ -49,10 +53,10 @@ linkup() {
      && wait_for_if_up $1 2>/dev/null
 }
 
-wait_for_if_link eth0
-wait_for_if_link eth1
-wait_for_if_link eth2
-wait_for_if_link eth3
+wait_for_if_link eth0 ens3
+wait_for_if_link eth1 ens4
+wait_for_if_link eth2 ens5
+wait_for_if_link eth3 ens6
 
 modprobe --all -b -q 8021q ipvlan macvlan
 >/dev/watchdog
diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh
index 7aae0f13..e4e541d3 100755
--- a/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh
+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/server-init.sh
@@ -3,7 +3,7 @@ exec </dev/console >/dev/console 2>&1
 set -x
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 export TERM=linux
-export PS1='nfstest-server:\w\$ '
+export PS1='server:\w\$ '
 stty sane
 echo "made it to the rootfs!"
 echo server > /proc/sys/kernel/hostname
@@ -13,7 +13,11 @@ wait_for_if_link() {
     local li
     while [ $cnt -lt 600 ]; do
         li=$(ip -o link show dev $1 2>/dev/null)
-        [ -n "$li" ] && return 0
+	[ -n "$li" ] && return 0
+        if [[ $2 ]]; then
+	    li=$(ip -o link show dev $2 2>/dev/null)
+	    [ -n "$li" ] && return 0
+        fi
         sleep 0.1
         cnt=$(($cnt+1))
     done
@@ -49,10 +53,10 @@ linkup() {
      && wait_for_if_up $1 2>/dev/null
 }
 
-wait_for_if_link eth0
-wait_for_if_link eth1
-wait_for_if_link eth2
-wait_for_if_link eth3
+wait_for_if_link eth0 ens3
+wait_for_if_link eth1 ens4
+wait_for_if_link eth2 ens5
+wait_for_if_link eth3 ens6
 
 modprobe --all -b -q 8021q ipvlan macvlan
 >/dev/watchdog