diff --git a/xCAT-test/autotest/testcase/installation/aix_diskless_installation b/xCAT-test/autotest/testcase/installation/aix_diskless_installation
index eb0c77736..f887e80eb 100644
--- a/xCAT-test/autotest/testcase/installation/aix_diskless_installation
+++ b/xCAT-test/autotest/testcase/installation/aix_diskless_installation
@@ -22,7 +22,7 @@ cmd:mknimimage -u autotestcosi
 check:rc==0
 cmd:rscan __GETNODEATTR($$CN, hcp)__ -w
 check:rc==0
-cmd:makeconservercf
+cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
diff --git a/xCAT-test/autotest/testcase/installation/aix_full_installation b/xCAT-test/autotest/testcase/installation/aix_full_installation
index c485d60a2..a8ee81434 100644
--- a/xCAT-test/autotest/testcase/installation/aix_full_installation
+++ b/xCAT-test/autotest/testcase/installation/aix_full_installation
@@ -17,7 +17,7 @@ cmd:chdef -t osimage -o autotest installp_bundle="xCATaixCN"
 check:rc==0
 cmd:rscan __GETNODEATTR($$CN, hcp)__ -w
 check:rc==0
-cmd:makeconservercf
+cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
diff --git a/xCAT-test/autotest/testcase/installation/linux_diskless_installation b/xCAT-test/autotest/testcase/installation/linux_diskless_installation
index 17eb38317..7d3446077 100644
--- a/xCAT-test/autotest/testcase/installation/linux_diskless_installation
+++ b/xCAT-test/autotest/testcase/installation/linux_diskless_installation
@@ -6,10 +6,7 @@ cmd:makedns
 check:rc==0
 cmd:service named restart
 check:rc==0
-cmd:nslookup $$CN
-check:rc==0
-check:output=~Address:\s+\d+.\d+.\d+.\d+
-cmd:makeconservercf
+cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
diff --git a/xCAT-test/autotest/testcase/installation/linux_full_installation b/xCAT-test/autotest/testcase/installation/linux_full_installation
index 195cda593..a3cd840bb 100644
--- a/xCAT-test/autotest/testcase/installation/linux_full_installation
+++ b/xCAT-test/autotest/testcase/installation/linux_full_installation
@@ -6,10 +6,7 @@ cmd:makedns
 check:rc==0
 cmd:service named restart
 check:rc==0
-cmd:nslookup $$CN
-check:rc==0
-check:output=~Address:\s+\d+.\d+.\d+.\d+
-cmd:makeconservercf
+cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN