diff --git a/xCAT-test/autotest/testcase/makedhcp/cases0 b/xCAT-test/autotest/testcase/makedhcp/cases0
index fd241f76b..046881516 100644
--- a/xCAT-test/autotest/testcase/makedhcp/cases0
+++ b/xCAT-test/autotest/testcase/makedhcp/cases0
@@ -1,3 +1,46 @@
+start:makedhcp_n
+os:Linux
+cmd:mv -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak
+cmd:makedhcp -n
+check:rc==0
+cmd:ls /etc/dhcp/dhcpd.conf
+check:rc==0
+cmd:ps -e | grep dhcpd
+check:rc==0
+check:output=~dhcpd
+cmd:mv -f /etc/dhcp/dhcpd.conf.bak /etc/dhcp/dhcpd.conf
+end
+
+start:makedhcp_a
+os:Linux
+cmd:lsdef -l $$CN -z > /tmp/$$CN.stanza
+cmd:chdef -t node -o $$CN mac=11:22:33:44:55:66
+cmd:makedhcp -a
+check:rc==0
+cmd:cat /var/lib/dhcpd/dhcpd.leases 
+check:output=~$$CN
+check:output=~11:22:33:44:55:66
+cmd:chdef -t node -o $$CN mac=
+cmd:cat /tmp/$$CN.stanza | chdef -z
+end
+start:makedhcp_a_d
+os:Linux
+cmd:makedhcp -a -d
+check:rc==0
+cmd:cat /var/lib/dhcpd/dhcpd.leases | grep $$CN
+check:output!~$$CN
+cmd:makedhcp -a
+end
+start:makedhcp_d
+os:Linux
+cmd:makedhcp -d $$CN
+check:rc==0
+cmd:cat /var/lib/dhcpd/dhcpd.leases | grep $$CN
+check:output!~$$CN
+cmd:makedhcp -a
+end
+
+
 start:makedhcp_h
 description:help
 cmd:makedhcp -h
@@ -39,7 +82,7 @@ check:rc==0
 check:output=~dhcpd
 end
 
-start:makedhcp_a
+start:makedhcp_a_linux
 description:Define all nodes to the DHCP server. (Will only add nodes that can be reached, network-wise, by this DHCP server.) The dhcp daemon does not have to be restarted after this.
 os:Linux
 cmd:mkdef -t node -o testnode1 groups=compute mac=11:22:33:55:66:88 arch=ppc64
@@ -58,7 +101,7 @@ cmd:rmdef testnode1
 cmd:mv -f /etc/dhcp/dhcpd.conf.bak /etc/dhcp/dhcpd.conf
 end
 
-start:makedhcp_a_d
+start:makedhcp_a_d_linux
 os:Linux
 cmd:lsdef -t node -l -z > /tmp/all.nodes
 cmd:mkdef -t node -o testnode1 groups=compute mac=11:22:33:55:66:88 arch=ppc64
@@ -81,7 +124,7 @@ cmd:rmdef testnode2
 #cmd:rm -f /tmp/1 /tmp/2
 end
 
-start:makedhcp_d
+start:makedhcp_d_linux
 description:Delete all node entries, added by xCAT, in the noderange from the DHCP server configuration.
 os:Linux
 cmd:mkdef -t node -o testnode1 groups=compute mac=11:22:33:55:66:88 arch=ppc64