diff --git a/tests/eclient/testdata/metadata.txt b/tests/eclient/testdata/metadata.txt
index 963b767af..83f0f4fde 100644
--- a/tests/eclient/testdata/metadata.txt
+++ b/tests/eclient/testdata/metadata.txt
@@ -20,7 +20,7 @@ message 'Waiting for AppInstMetadata'
 # Use eden.lim.test for access Infos with timewait 10m in background
 test eden.lim.test -test.v -timewait 10m -test.run TestInfo -out InfoContent.amdinfo.data 'InfoContent.amdinfo.data:world' &
 
-exec -t 5m bash ssh.sh
+exec -t 10m bash ssh.sh
 
 # wait for detector
 wait
@@ -44,7 +44,7 @@ test:
 
 -- ssh.sh --
 EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}}
-for i in `seq 20`
+for i in `seq 200`
 do
   sleep 20
   # Test SSH-access to container
diff --git a/tests/eclient/testdata/userdata.txt b/tests/eclient/testdata/userdata.txt
index 9a36cab93..931f06dfd 100644
--- a/tests/eclient/testdata/userdata.txt
+++ b/tests/eclient/testdata/userdata.txt
@@ -38,14 +38,14 @@ exec -t 10s bash generate_userdata.sh
 eden pod deploy -n eclient --memory=512MB --networks=n1 {{template "eclient_image"}} -p {{$port}}:22 --metadata={{$userdata_file}}
 test eden.app.test -test.v -timewait 20m RUNNING eclient
 
-exec -t 40s bash test_injected_file.sh "before_restart"
+exec -t 400s bash test_injected_file.sh "before_restart"
 
-exec -t 40s bash change_injected_file.sh "after_restart"
+exec -t 400s bash change_injected_file.sh "after_restart"
 
 eden pod restart eclient
 test eden.app.test -test.v -timewait 20m -check-new RUNNING eclient
 
-exec -t 40s bash test_injected_file.sh "after_restart"
+exec -t 400s bash test_injected_file.sh "after_restart"
 
 eden pod delete eclient
 
@@ -88,7 +88,7 @@ TEXT=$1
 echo $EDEN sdn fwd eth0 {{$port}} -- {{template "ssh"}} grep -q $TEXT /etc/injected_file.txt
 
 # Retry in case there are connectivity issues
-for i in `seq 30`
+for i in `seq 300`
 do
   echo Try $i
   $EDEN sdn fwd eth0 {{$port}} -- {{template "ssh"}} grep -q $TEXT /etc/injected_file.txt && echo "Success" && break