diff --git a/xCAT-test/autotest/testcase/analyze_log/case0 b/xCAT-test/autotest/testcase/analyze_log/case0
index 3f39c38a1..2640bbbaa 100644
--- a/xCAT-test/autotest/testcase/analyze_log/case0
+++ b/xCAT-test/autotest/testcase/analyze_log/case0
@@ -1,6 +1,6 @@
 start:check_mn_cluster_log_file
-os:Linux
 description:check known error message in /var/log/xcat/cluster.log file. Only for redhat and sles.
+label:mn_only
 cmd:cat /var/log/xcat/cluster.log | grep "xcatd: Error happened when receiving data from DB access"
 check:output!~xcatd: Error happened when receiving data from DB access
 cmd:cat /var/log/xcat/cluster.log | grep "Undefined subroutine &main"
diff --git a/xCAT-test/autotest/testcase/chvm/cases0 b/xCAT-test/autotest/testcase/chvm/cases0
index b177591e5..eccd82b47 100644
--- a/xCAT-test/autotest/testcase/chvm/cases0
+++ b/xCAT-test/autotest/testcase/chvm/cases0
@@ -4,8 +4,10 @@
 #check:rc!=0
 #check:output=~Usage
 #end
+
 start:chvm_p
 hcp:hmc
+label:others,virtualization
 cmd:mkdef -t node -o testnode mgt=hmc groups=all
 cmd:mkvm testnode -i $$MaxLparID -l $$CN
 check:rc==0
@@ -26,8 +28,10 @@ check:output=~__GETNODEATTR($$CN, pprofile)__
 cmd:rmvm testnode
 cmd:rm -f /tmp/autotest.profile
 end
+
 start:chvm_attr
 hcp:hmc
+label:others,virtualization
 cmd:mkdef -t node -o testnode mgt=hmc groups=all
 cmd:mkvm testnode -i $$MaxLparID -l $$CN
 check:rc==0
@@ -38,12 +42,16 @@ cmd:lsvm testnode
 check:output=~min_mem=1024
 cmd:rmvm testnode
 end
+
 start:chvm_node
+label:mn_only,virtualization
 cmd:chvm $$CN
 check:rc!=0
 check:output=~Usage
 end
+
 start:chvm_err_node
+label:mn_only,virtualization
 cmd:dir="/tmp/chvm_err_node";echo ${dir}".old";if [ -d "${dir}" ];then mv ${dir} ${dir}".old"; fi; mkdir -p $dir
 check:rc==0
 cmd:lsdef bogusnode > /dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef bogusnode -z >/tmp/chvm_err_node/bogusnode.stanza ;rmdef bogusnode;fi
diff --git a/xCAT-test/autotest/testcase/lsxcatd/cases0 b/xCAT-test/autotest/testcase/lsxcatd/cases0
index 54568165f..59f0f5bfa 100644
--- a/xCAT-test/autotest/testcase/lsxcatd/cases0
+++ b/xCAT-test/autotest/testcase/lsxcatd/cases0
@@ -1,11 +1,13 @@
 start:lsxcatd_null
 description:lsxcatd without any flag
+label:mn_only,xcatd
 cmd:lsxcatd
 check:output=~lsxcatd
 end
 
 start:lsxcatd_h
 description:lsxcatd -h
+label:mn_only,xcatd
 cmd:lsxcatd -h
 check:rc==0
 check:output=~lsxcatd
@@ -13,6 +15,7 @@ end
 
 start:lsxcatd_d
 description:lsxcatd -d
+label:mn_only,xcatd
 cmd:lsxcatd -d
 check:rc==0
 check:output=~(cfgloc|dbengine|dbinstance|dbname|dbloc)
@@ -20,6 +23,7 @@ end
 
 start:lsxcatd_a
 description:lsxcatd -a
+label:mn_only,xcatd
 cmd:lsxcatd -a
 check:rc==0
 check:output=~Version
diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0
index 8b33d036e..275e720c4 100644
--- a/xCAT-test/autotest/testcase/xcatconfig/case0
+++ b/xCAT-test/autotest/testcase/xcatconfig/case0
@@ -1,11 +1,12 @@
 start:testtest
+label:mn_only,db
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcatconfig/change_site_table_values
 check:rc==0
 end
 
 start:xcatconfig_null
 description:xcatconfig with no argument
-os:Linux
+label:mn_only
 cmd:xcatconfig
 check:output=~No parameters were supplied on the xcatconfig command. Run xcatconfig -h
 check:rc!=0
@@ -13,7 +14,7 @@ end
 
 start:xcatconfig_h
 description:xcatconfig -h and --help
-os:Linux
+label:mn_only
 cmd:xcatconfig -h
 check:rc==0
 check:output=~Usage
@@ -24,7 +25,7 @@ end
 
 start:xcatconfig_v
 description:xcatconfig -v and --version
-os:Linux
+label:mn_only
 cmd:xcatconfig -v
 check:rc==0
 check:output=~version|Version
@@ -35,7 +36,7 @@ end
 
 start:xcatconfig_k
 description:To regenerate root's ssh keys
-os:Linux
+label:mn_only
 #step1:backup /root/.ssh
 cmd:cp -rf /root/.ssh /root/sshbak
 check:rc==0
@@ -56,13 +57,12 @@ cmd:mv -f /root/sshbak/* /root/.ssh
 check:rc==0
 cmd:rm -rf /root/sshbak
 check:rc==0
-
 end
 
 
 start:xcatconfig_k_c
 description:To regenerate root's ssh keys and cretials
-os:Linux
+label:mn_only
 #step1:backup /root/.ssh
 cmd:cp -rf /root/.ssh /root/sshbak
 check:rc==0
@@ -93,7 +93,7 @@ end
 
 start:xcatconfig_c
 description:To regenerate cretials
-os:Linux
+label:mn_only
 #step1:backup: /etc/xcat/ca /etc/xcat/cert
 cmd:cp -r /etc/xcat/ca /etc/xcat/cabak;cp -r /etc/xcat/cert /etc/xcat/certbak
 #step2:run command and check the output
@@ -117,7 +117,7 @@ end
 
 start:xcatconfig_s
 description:To regenerate node host ssh keys
-os:Linux
+label:mn_only
 #step1:backup: /etc/xcat/hostkeys  /install/postscripts/hostkeys
 cmd:cp -rf /etc/xcat/hostkeys /etc/xcat/hostkeysbak
 check:rc==0
@@ -147,7 +147,7 @@ end
 
 start:xcatconfig_s_c
 description:To regenerate node host ssh keys and credentials
-os:Linux
+label:mn_only
 #step1:backup: /etc/xcat/hostkeys  /install/postscripts/hostkeys
 cmd:cp -rf /etc/xcat/hostkeys /etc/xcat/hostkeysbak
 check:rc==0
@@ -181,7 +181,7 @@ end
 
 start:xcatconfig_d_V
 description:This -d option will reinitialize the basic xCAT database table setup
-os:Linux
+label:mn_only
 #step1:backup database and prepare test data
 cmd:dumpxCATdb -p /tmp/xcatconfigtest
 check:rc==0
@@ -210,8 +210,8 @@ end
 
 
 start:xcatconfig_i
-os:Linux
 description:Initial the xCAT installation in Management Node, only node host key regenerated, xcatd restart; xCAT credentials, database and the ssh key are not changed
+label:mn_only
 #step1:backup test environment and prepare test data
 #backup test environment, including database, /root/.ssh/, /etc/xcat/hostkey/, install/postscripts/hostkeys
 cmd:dumpxCATdb -p /tmp/xcatconfigtest
@@ -265,8 +265,8 @@ end
      
      
 start:xcatconfig_u
-os:Linux
 description:Update xCAT in Management Node, xcatd restart; database, xCAT credentials, node ssh key and root ssh key are not changed
+label:mn_only
 #step1:backup test environment and prepare test data
 #backup test environment, including database, /root/.ssh/, /etc/xcat/hostkey/, install/postscripts/hostkeys
 cmd:dumpxCATdb -p /tmp/xcatconfigtest
@@ -317,8 +317,9 @@ check:rc==0
 end
 
 start:xcatconfig_u_check_xcatsslversion_rhels_sles
-os:rhels,sles
 description:after xcatconfig -u the site.xcatsslversion will not be changed
+os:rhels,sles
+label:mn_only
 cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1$'
 check:rc==0
 cmd:chtab key=xcatsslversion site.value=TLSv12
@@ -337,6 +338,7 @@ end
 start:xcatconfig_u_check_xcatsslversion_ubuntu
 description:after xcatconfig -u the site.xcatsslversion will not be changed
 os:ubuntu
+label:mn_only
 cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1$'
 check:rc==0
 cmd:chtab key=xcatsslversion site.value=TLSv1_2
diff --git a/xCAT-test/autotest/testcase/xcatd/case0 b/xCAT-test/autotest/testcase/xcatd/case0
index dd9c72a65..83974ae52 100644
--- a/xCAT-test/autotest/testcase/xcatd/case0
+++ b/xCAT-test/autotest/testcase/xcatd/case0
@@ -1,10 +1,11 @@
 start:xcatd_start
 description:stop then start xcatd daemon, and check all the 6 processes are running
-os:linux
+label:mn_only,xcatd
 cmd:if [ -d "/tmp/xcatd_start" ]; then mv /tmp/xcatd_start /tmp/xcatd_start.org; fi; mkdir -p /tmp/xcatd_start
 check:rc==0
 cmd:service xcatd status
 check:rc==0
+check:output=~xcatd service|xcatd.service
 check:output=~Active: active \(running\)|xcatd service is running
 cmd:ps axjf |grep -v grep |grep "xcatd:" | tee /tmp/xcatd_start/original_xcatd_processes_status
 check:rc==0
@@ -22,6 +23,7 @@ check:rc==0
 cmd:sleep 3
 cmd:service xcatd status
 check:rc==0
+check:output=~xcatd service|xcatd.service
 check:output=~Active: active \(running\)|xcatd service is running
 cmd:ps axjf |grep -v grep |grep "xcatd:" | tee /tmp/xcatd_start/after_start_xcatd_processes_status
 check:rc==0
@@ -43,61 +45,22 @@ cmd: rm -rf /tmp/xcatd_start; if [ -d "/tmp/xcatd_start.org" ]; then mv /tmp/xca
 check:rc==0
 end
 
-start:xcatd_start_systemd
-description:this is the test case when xcat service is managed by systemd on sles12* and ubuntu16.04, the output of service xcatd changes,stop then start xcatd daemon, and check all the 6 processes are running
-os:linux
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
-check:output=~/system.slice/xcatd.service
-check:output=~xcatd: SSL
-check:output=~xcatd: DB
-check:output=~xcatd: UDP
-check:output=~xcatd: install
-check:output=~xcatd: Discovery
-check:output=~xcatd: Command log
-cmd:service xcatd stop
-check:rc==0
-cmd:sleep 3
-cmd:service xcatd status
-check:rc!=0
-check:output=~xcatd.service
-check:output=~inactive \(dead\)
-cmd:service xcatd start
-check:rc==0
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
-cmd:result=`ps -ef | grep "xcatd: SSL listener" | grep -v grep | wc -l`; if [ $result -eq 1 ]; then echo "only one process"; fi
-check:output=~only one process
-cmd:result=`ps -ef | grep "xcatd: DB Access" | grep -v grep | wc -l`; if [ $result -eq 1 ]; then echo "only one process"; fi
-check:output=~only one process
-cmd:result=`ps -ef | grep "xcatd: UDP listener" | grep -v grep | wc -l`; if [ $result -eq 1 ]; then echo "only one process"; fi
-check:output=~only one process
-cmd:result=`ps -ef | grep "xcatd: install monitor" | grep -v grep | wc -l`; if [ $result -eq 1 ]; then echo "only one process"; fi
-check:output=~only one process
-cmd:result=`ps -ef | grep "xcatd: Discovery worke" | grep -v grep | wc -l`; if [ $result -eq 1 ]; then echo "only one process"; fi
-check:output=~only one process
-cmd:result=`ps -ef | grep "xcatd: Command log writer" | grep -v grep | wc -l`; if [ $result -eq 1 ]; then echo "only one process"; fi
-check:output=~only one process
-end
-
 
 start:xcatd_stop
 description:stop xcatd daemon, then check all the 6 processes are stopped
-os:linux
+label:mn_only,xcatd
 cmd:service xcatd status
 check:rc==0
-check:output=~xcatd service is running
+check:output=~xcatd service|xcatd.service
+check:output=~xcatd service is running|active \(running\)
 cmd:service xcatd stop
 check:rc==0
 check:output=~Stopping x(cat|CAT)d
 check:output=~[  OK  ]
 cmd:sleep 3
 cmd:service xcatd status
-check:output=~xcatd service is not running
+check:output=~xcatd service|xcatd.service
+check:output=~xcatd service is not running|inactive \(dead\)
 cmd:ps -ef | grep xcatd
 check:output!~"xcatd: SSL listener"
 check:output!~"xcatd: DB Access"
@@ -109,111 +72,39 @@ cmd:service xcatd start
 check:rc==0
 end
 
-start:xcatd_stop_systemd
-description:this is the test case when xcat service is managed by systemd on sles12* and ubuntu16.04, the output of service xcatd changes,stop xcatd daemon, then check all the 6 processes are stopped
-os:linux
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
-check:output=~/system.slice/xcatd.service
-check:output=~xcatd: SSL 
-check:output=~xcatd: DB 
-check:output=~xcatd: UDP 
-check:output=~xcatd: install 
-check:output=~xcatd: Discovery 
-check:output=~xcatd: Command log 
-cmd:service xcatd stop
-check:rc==0
-cmd:sleep 3
-cmd:service xcatd status
-check:rc!=0
-check:output=~xcatd.service
-check:output=~inactive \(dead\)
-cmd:ps -ef | grep xcatd
-check:output!~"xcatd: SSL"
-check:output!~"xcatd: DB"
-check:output!~"xcatd: UDP"
-check:output!~"xcatd: install"
-check:output!~"xcatd: Discovery"
-check:output!~"xcatd: Command log"
-cmd:service xcatd start
-check:rc==0
-end
 
 start:xcatd_restart
 description:restart xcatd daemon
-os:linux
+label:mn_only,xcatd
 cmd:service xcatd status
-check:output=~xcatd service is running
+check:output=~xcatd service|xcatd.service
+check:output=~xcatd service is running|active \(running\)
 check:rc==0
 cmd:times=10; while [ $times -gt 0 ]; do service xcatd restart; if [ "$?" -ne "0" ]; then break; fi; ((times--)); done; if [ $times -gt 0 ]; then $?=1; fi
 check:rc==0
 cmd:service xcatd status
-check:output=~xcatd service is running
+check:output=~xcatd service|xcatd.service
+check:output=~xcatd service is running|active \(running\)
 check:rc==0
 end
 
-start:xcatd_restart_systemd
-description:this is the test case when xcat service is managed by systemd on sles12* and ubuntu16.04, the output of service xcatd changes,restart xcatd daemon
-os:linux
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
-cmd:times=10; while [ $times -gt 0 ]; do service xcatd restart; if [ "$?" -ne "0" ]; then break; fi; ((times--)); done; if [ $times -gt 0 ]; then $?=1; fi
-check:rc==0
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
-end
 
 
 start:run_command_with_XCATBYPASS
 description:with XCATBYPASS=YES, the command works either xcatd deamon running or not
-os:linux
+label:mn_only,xcatd
 cmd:service xcatd status
 check:rc==0
-check:output=~xcatd service is running
-cmd:XCATBYPASS=YES tabdump site
-check:rc==0
-cmd:service xcatd stop
-check:rc==0
-check:output=~Stopping x(cat|CAT)d
-check:output=~[  OK  ]
-cmd:sleep 3
-cmd:service xcatd status
-check:output=~xcatd service is not running
-cmd:tabdump site
-check:rc!=0
-cmd:XCATBYPASS=YES tabdump site
-check:rc==0
-cmd:service xcatd start
-check:rc==0
-check:output=~Starting x(cat|CAT)d
-check:output=~[  OK  ]
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd service is running
-end
-
-start:run_command_with_XCATBYPASS_systemd
-description:wis is the test case when xcat service is managed by systemd,on sles12* and ubuntu16.04, the output of service xcatd changes,with XCATBYPASS=YES, the command works either xcatd deamon running or not
-os:linux
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
+check:output=~xcatd service|xcatd.service
+check:output=~xcatd service is running|active \(running\)
 cmd:XCATBYPASS=YES tabdump site
 check:rc==0
 cmd:service xcatd stop
 check:rc==0
 cmd:sleep 3
 cmd:service xcatd status
-eck:rc!=0
-check:output=~xcatd.service
-check:output=~inactive \(dead\)
+check:output=~xcatd service|xcatd.service
+check:output=~xcatd service is not running|inactive \(dead\)
 cmd:tabdump site
 check:rc!=0
 cmd:XCATBYPASS=YES tabdump site
@@ -222,23 +113,17 @@ cmd:service xcatd start
 check:rc==0
 cmd:service xcatd status
 check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
-check:output=~/system.slice/xcatd.service
-check:output=~xcatd: SSL 
-check:output=~xcatd: DB 
-check:output=~xcatd: UDP 
-check:output=~xcatd: install 
-check:output=~xcatd: Discovery 
-check:output=~xcatd: Command log 
+check:output=~xcatd service|xcatd.service
+check:output=~xcatd service is running|active \(running\)
 end
 
 start:disable_root_permission_in_policy_table
 description:disable root permission, only with XCATBYPASS=YES, the command works 
-os:linux
+label:mn_only,xcatd
 cmd:service xcatd status
 check:rc==0
-check:output=~xcatd service is running
+check:output=~ xcatd service|xcatd.service
+check:output=~xcatd service is running|active \(running\)
 cmd:chtab name=root policy.rule=disable
 check:rc==0
 cmd:lsdef
@@ -251,31 +136,14 @@ cmd:lsdef
 check:rc==0
 end
 
-start:disable_root_permission_in_policy_table_systemd 
-description:this is the test case when xcat service is managed by systemd on sles12* and ubuntu16.04, the output of service xcatd changes,disable root permission, only with XCATBYPASS=YES, the command works
-os:linux
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
-cmd:chtab name=root policy.rule=disable
-check:rc==0
-cmd:lsdef
-check:output=~Error: (\[.*?\]: )?Permission denied for request
-cmd:XCATBYPASS=YES lsdef
-check:rc==0
-cmd:XCATBYPASS=YES chtab name=root policy.rule=allow
-check:rc==0
-cmd:lsdef
-check:rc==0
-end
 
 start:assign_certain_command_permission
 description:assign root permission to certain command, only this command works 
-os:linux
+label:mn_only,xcatd
 cmd:service xcatd status
 check:rc==0
-check:output=~xcatd service is running
+check:output=~ xcatd service |xcatd.service
+check:output=~xcatd service is running|active \(running\)
 cmd:lsdef
 check:rc==0
 cmd:tabdump policy
@@ -290,24 +158,4 @@ cmd:chtab name=root policy.commands= policy.rule=allow
 check:rc==0
 end
 
-start:assign_certain_command_permission_systemd
-description:this is the test case when xcat service is managed by systemd on sles12* and ubuntu16.04, the output of service xcatd changes,assign root permission to certain command, only this command works
-os:linux
-cmd:service xcatd status
-check:rc==0
-check:output=~xcatd.service
-check:output=~active \(running\)
-cmd:lsdef
-check:rc==0
-cmd:tabdump policy
-check:rc==0
-cmd:chtab name=root policy.commands=lsdef policy.rule=allow
-check:rc==0
-cmd:lsdef
-check:rc==0
-cmd:tabdump policy
-check:output=~Error: (\[.*?\]: )?Permission denied for request
-cmd:chtab name=root policy.commands= policy.rule=allow
-check:rc==0
-end
 
diff --git a/xCAT-test/autotest/testcase/xcatsnap/cases0 b/xCAT-test/autotest/testcase/xcatsnap/cases0
index 3c336f61c..52607b868 100644
--- a/xCAT-test/autotest/testcase/xcatsnap/cases0
+++ b/xCAT-test/autotest/testcase/xcatsnap/cases0
@@ -1,5 +1,6 @@
 start:xcatsnap_null
 description:xcatsnap with no argument
+label:mn_only
 cmd:xcatsnap
 check:rc==0
 check:output=~Send .* to IBM Support
@@ -8,6 +9,7 @@ end
 
 start:xcatsnap_b_d
 description:xcatsnap -B -d
+label:mn_only
 cmd:xcatsnap -B -d /tmp/testdir
 check:rc==0
 check:output=~Send .* to IBM Support
@@ -18,6 +20,7 @@ end
 
 start:xcatsnap_h
 description:xcatsnap -h and --help
+label:mn_only
 cmd:xcatsnap -h
 check:output=~Usage
 cmd:xcatsnap --help
@@ -27,6 +30,7 @@ end
 
 start:xcatsnap_v
 description:xcatsnap -v and --version
+label:mn_only
 cmd:xcatsnap -v
 check:output=~version|Version
 cmd:xcatsnap --version