diff --git a/.gitlab-ci-full-integration-template.yml b/.gitlab-ci-full-integration-template.yml
index 51a1d76d7..1560ed464 100644
--- a/.gitlab-ci-full-integration-template.yml
+++ b/.gitlab-ci-full-integration-template.yml
@@ -51,7 +51,8 @@ test:integration:$CI_NODE_INDEX:
     # running with high parallelism on a single VM
     - sysctl -w fs.inotify.max_user_instances=1024
     - sysctl -w fs.file-max=600000
-    - ulimit -n 524288
+    - sysctl -w net.ipv4.tcp_retries2=8
+    - ulimit -a unlimited
 
   script:
     - cd tests
diff --git a/tests/tests/test_mender_connect.py b/tests/tests/test_mender_connect.py
index 001eea88d..d4e4e1daa 100644
--- a/tests/tests/test_mender_connect.py
+++ b/tests/tests/test_mender_connect.py
@@ -404,6 +404,7 @@ def docker_env_flaky_test(self, enterprise_one_docker_client_bootstrapped):
 
         yield env
 
+    @flaky(max_runs=3)
     def test_in_poor_network_environment(self, docker_env):
         self.assert_env(docker_env)