diff --git a/etc/zinit/contd.yaml b/etc/zinit/contd.yaml
index 46ad78c2d..09f1fa5a2 100644
--- a/etc/zinit/contd.yaml
+++ b/etc/zinit/contd.yaml
@@ -1,4 +1,5 @@
 exec: contd --broker unix:///var/run/redis.sock --root /var/cache/modules/contd
+test: zbusdebug --module container
 after:
   - containerd
   - boot
diff --git a/etc/zinit/flistd.yaml b/etc/zinit/flistd.yaml
index 5c2926211..dafe63852 100644
--- a/etc/zinit/flistd.yaml
+++ b/etc/zinit/flistd.yaml
@@ -1,4 +1,5 @@
 exec: flistd --broker unix:///var/run/redis.sock --root /var/cache/modules/flistd
+test: zbusdebug --module flist
 after:
   - boot
   # identityd is added to make sure all binaries are up to date
diff --git a/etc/zinit/gateway.yaml b/etc/zinit/gateway.yaml
index e9c14e5bc..5a8836ca1 100644
--- a/etc/zinit/gateway.yaml
+++ b/etc/zinit/gateway.yaml
@@ -1,4 +1,5 @@
 exec: gateway --broker unix:///var/run/redis.sock --root /var/cache/modules/gateway
+test: zbusdebug --module gateway
 after:
   - boot
   - networkd
diff --git a/etc/zinit/noded.yaml b/etc/zinit/noded.yaml
index 247c52da7..678b1578c 100644
--- a/etc/zinit/noded.yaml
+++ b/etc/zinit/noded.yaml
@@ -1,4 +1,5 @@
 exec: ip netns exec ndmz noded --broker unix:///var/run/redis.sock
+test: zbusdebug --module node
 after:
   - boot
   - networkd
diff --git a/etc/zinit/provisiond.yaml b/etc/zinit/provisiond.yaml
index 06554b31f..4a2015442 100644
--- a/etc/zinit/provisiond.yaml
+++ b/etc/zinit/provisiond.yaml
@@ -1,6 +1,7 @@
 # provisind runs inside ndmz. the ndmz has rules to accept connection to
 # provisiond address :2021
 exec: provisiond --broker unix:///var/run/redis.sock --root /var/cache/modules/provisiond
+test: zbusdebug --module provision
 after:
   - boot
   - flistd
diff --git a/etc/zinit/qsfsd.yaml b/etc/zinit/qsfsd.yaml
index ffda01320..30e06bcde 100644
--- a/etc/zinit/qsfsd.yaml
+++ b/etc/zinit/qsfsd.yaml
@@ -1,4 +1,5 @@
 exec: qsfsd --broker unix:///var/run/redis.sock --root /var/cache/modules/qsfsd
+test: zbusdebug --module qsfsd
 after:
   - boot
   - contd
\ No newline at end of file
diff --git a/etc/zinit/storaged.yaml b/etc/zinit/storaged.yaml
index ed91cc619..15647dfde 100644
--- a/etc/zinit/storaged.yaml
+++ b/etc/zinit/storaged.yaml
@@ -1,5 +1,5 @@
 exec: storaged --broker unix:///var/run/redis.sock
 # we only consider the storaged is running only if the /var/cache is mounted
-test: mountpoint /var/cache
+test: sh -c "mountpoint /var/cache && zbusdebug --module storage"
 after:
   - node-ready
diff --git a/etc/zinit/vmd.yaml b/etc/zinit/vmd.yaml
index c0223cd05..5ea49e8e8 100644
--- a/etc/zinit/vmd.yaml
+++ b/etc/zinit/vmd.yaml
@@ -1,4 +1,5 @@
 exec: vmd --broker unix:///var/run/redis.sock
+test: zbusdebug --module vmd
 after:
   - boot
   - networkd