diff --git a/nixos/tests/etcd/etcd.nix b/nixos/tests/etcd/etcd.nix
index a32d0f9a55d1..3334cb0a4efc 100644
--- a/nixos/tests/etcd/etcd.nix
+++ b/nixos/tests/etcd/etcd.nix
@@ -1,15 +1,22 @@
 # This test runs simple etcd node
-
 import ../make-test-python.nix ({ pkgs, ... } : {
   name = "etcd";
-
   meta = with pkgs.lib.maintainers; {
     maintainers = [ offline ];
   };
 
   nodes = {
     node = { ... }: {
-      services.etcd.enable = true;
+      services.etcd = {
+        enable = true;
+        # Ensure etcd is ready to accept connections
+        extraConf = {
+          "initial-advertise-peer-urls" = "http://localhost:2380";
+          "listen-peer-urls" = "http://localhost:2380";
+          "listen-client-urls" = "http://localhost:2379";
+          "advertise-client-urls" = "http://localhost:2379";
+        };
+      };
     };
   };
 
@@ -17,9 +24,11 @@ import ../make-test-python.nix ({ pkgs, ... } : {
     with subtest("should start etcd node"):
         node.start()
         node.wait_for_unit("etcd.service")
+        # Add additional wait for actual readiness
+        node.wait_until_succeeds("etcdctl endpoint health")
 
     with subtest("should write and read some values to etcd"):
-        node.succeed("etcdctl put /foo/bar 'Hello world'")
-        node.succeed("etcdctl get /foo/bar | grep 'Hello world'")
+        node.succeed("etcdctl --endpoints=http://localhost:2379 put /foo/bar 'Hello world'")
+        node.succeed("etcdctl --endpoints=http://localhost:2379 get /foo/bar | grep 'Hello world'")
   '';
 })