diff --git a/tests/nixos/s3-binary-cache-store.nix b/tests/nixos/s3-binary-cache-store.nix
index 8e480866070..8f53c7e76c2 100644
--- a/tests/nixos/s3-binary-cache-store.nix
+++ b/tests/nixos/s3-binary-cache-store.nix
@@ -67,7 +67,12 @@ in
 
       # Create a binary cache.
       server.wait_for_unit("minio")
+<<<<<<< HEAD
       server.wait_for_unit("network-online.target")
+=======
+      server.wait_for_unit("network-addresses-eth1.service")
+      server.wait_for_open_port(9000)
+>>>>>>> ca9696748 (Make the S3 test more robust)
 
       server.succeed("mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4")
       server.succeed("mc mb minio/my-cache")