diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
index a77f1d372403ce419b42777cda90ece5e1e5f8e5..88479db49749bd44836aba8b73d2a7a2ac33c441 100644
--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -28,8 +28,8 @@ readonly defaults_file="$SYSCONFDIR/default/ganeti"
 # order is important as there are dependencies between them. On shutdown,
 # they're stopped in reverse order.
 DAEMONS=(
-  ganeti-wconfd
   ganeti-noded
+  ganeti-wconfd
   ganeti-rapi
   ganeti-luxid
   )
diff --git a/test/py/daemon-util_unittest.bash b/test/py/daemon-util_unittest.bash
index 07fe1b00c0e020aa2fc84f941fefd17c77fb96ae..463bcdaaaa1674eab1fc9e3f5b8c86cb5b016756 100755
--- a/test/py/daemon-util_unittest.bash
+++ b/test/py/daemon-util_unittest.bash
@@ -36,8 +36,8 @@ if ! grep -q '^ENABLE_MOND = ' lib/_constants.py; then
   err "Please update $0, mond enable feature is missing"
 fi
 
-DAEMONS_LIST="wconfd noded rapi luxid"
-STOPDAEMONS_LIST="luxid rapi noded wconfd"
+DAEMONS_LIST="noded wconfd rapi luxid"
+STOPDAEMONS_LIST="luxid rapi wconfd noded"
 
 if grep -q '^ENABLE_CONFD = True' lib/_constants.py; then
   DAEMONS_LIST="$DAEMONS_LIST confd"