diff --git a/conf.d/server.mk b/conf.d/server.mk
index a281807c..40ca4988 100644
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -19,4 +19,6 @@ distro/server-ovz: distro/server-mini use/server/ovz use/server/groups/base \
 	use/install2/net use/hdt use/rescue \
 	use/firmware/server use/firmware/cpu +wireless; @:
 
+distro/server-zabbix: distro/server-mini use/server/zabbix; @:
+
 endif
diff --git a/conf.d/test.mk b/conf.d/test.mk
index 869fdc8c..88415f87 100644
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -17,6 +17,11 @@ distro/live-gns3: distro/live-icewm
 	@$(call add,LIVE_LISTS,gns3)
 	@$(call add,LIVE_KMODULES,kvm virtualbox)
 
+# NB: requires runtime Server/ServerActive setup in zabbix_agentd.conf
+distro/live-zabbix: distro/live-icewm use/net-eth
+	@$(call add,THE_PACKAGES,zabbix-agent)
+	@$(call add,DEFAULT_SERVICES_ENABLE,zabbix_agentd)
+
 distro/icewm-efi: distro/icewm use/efi/debug use/firmware
 	@$(call add,INSTALL2_PACKAGES,strace)
 
@@ -44,6 +49,8 @@ distro/desktop-systemd: distro/icewm +systemd; @:
 distro/desktop-plymouth: distro/icewm +plymouth; @:
 distro/server-efi: distro/server-mini use/efi/debug; @:
 
+distro/server-zabbix: distro/server-mini use/server/zabbix use/net-eth
+
 endif # IMAGE_CLASS: distro
 
 ifeq (ve,$(IMAGE_CLASS))