diff --git a/xCAT-test/autotest/testcase/passwd/case0 b/xCAT-test/autotest/testcase/passwd/case0
index 0c41c9b65..74e7c52fc 100644
--- a/xCAT-test/autotest/testcase/passwd/case0
+++ b/xCAT-test/autotest/testcase/passwd/case0
@@ -76,8 +76,6 @@ cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod
 check:rc==0
 cmd:chtab key=system passwd.cryptmethod=sha256
 check:rc==0
-cmd:tabdump passwd |grep -i sha256 
-check:rc==0
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 cmd:grep '\$5\$' /install/autoinst/$$CN
@@ -219,30 +217,34 @@ end
 
 start:encrypted_passwd_openssl_diskfull
 description: this case is to test when password is encrypted with openssl, the password is encryped in password table. When compute node is diskfull provisioned, users can login node with correct password. This case should be run when node is correctly defined.
-cmd:tabdump passwd |grep -i system > /tmp/tmpcryptmethod
+cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod
+check:rc==0
+cmd:gettab key=system passwd.password > /tmp/tmppassword
 check:rc==0
 cmd:chtab key=system passwd.username=root passwd.password=`openssl passwd -1 abc123`
 check:rc==0
-cmd:tabdump passwd |grep '\$1\$' 
+cmd:gettab key=system passwd.password |grep '\$1\$'
 check:rc==0
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 cmd:grep '\$1\$' /install/autoinst/$$CN
 check:rc==0
-cmd:oldpassword=`cat /tmp/tmpcryptmethod |awk -F , '{print $3}' |sed 's/\"//g'`;oldcryptmethod=`cat /tmp/tmpcryptmethod |awk -F , '{print $4}' |sed 's/\"//g'`;chtab key=system passwd.password=$oldpassword passwd.cryptmethod=$oldcryptmethod
+cmd:oldpassword=`cat /tmp/tmppassword |sed 's/\"//g'`;oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.password=$oldpassword passwd.cryptmethod=$oldcryptmethod
 check:rc==0
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
-cmd:rm -rf /tmp/tmpcryptmethod
+cmd:rm -rf /tmp/tmpcryptmethod /tmp/tmppassword
 end
 
 start:encrypted_passwd_openssl_diskless
 description: this case is to test when password is encrypted with openssl, the password is encryped in password table. When compute node is diskless provisioned, users can login node with correct password. This case should be run when node is correctly defined.
-cmd:tabdump passwd |grep -i system > /tmp/tmpcryptmethod
+cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod
+check:rc==0
+cmd:gettab key=system passwd.password > /tmp/tmppassword
 check:rc==0
 cmd:chtab key=system passwd.username=root passwd.password=`openssl passwd -1 abc123`
 check:rc==0
-cmd:tabdump passwd |grep '\$1\$'
+cmd:gettab key=system passwd.password |grep '\$1\$'
 check:rc==0
 #config CN to do diskless provision
 cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
@@ -288,7 +290,7 @@ cmd:grep 'root:\$1\$' /tmp/shadow
 check:rc==0
 cmd:rootimgdir=`lsdef -t osimage  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
 check:rc==0
-cmd:oldpassword=`cat /tmp/tmpcryptmethod |awk -F , '{print $3}' |sed 's/\"//g'`;oldcryptmethod=`cat /tmp/tmpcryptmethod |awk -F , '{print $4}' |sed 's/\"//g'`;chtab key=system passwd.password=$oldpassword passwd.cryptmethod=$oldcryptmethod
+cmd:oldpassword=`cat /tmp/tmppassword |sed 's/\"//g'`;oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.password=$oldpassword passwd.cryptmethod=$oldcryptmethod
 check:rc==0
-cmd:rm -rf /tmp/tmpcryptmethod /tmp/shadow
+cmd:rm -rf /tmp/tmpcryptmethod  /tmp/tmppassword /tmp/shadow
 end