diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index 0d63f40de..eaec03810 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -115,9 +115,9 @@ if ($genesis_runcmd_test) {
     send_msg(2, "[$$]:Running nodeset NODE runcmd test...............");
     my $testxdsh_value = &rungenesiscmd(&get_arch);
     if (&testxdsh($testxdsh_value)) {
-        send_msg(0, "[$$]:Could not verify test results using xdsh($testxdsh_value) on first attempt, will try again...............");
+        send_msg(0, "[$$]:Could not verify runcmd test results using xdsh($testxdsh_value) on first attempt, will try again...............");
         if (&testxdsh($testxdsh_value)) {
-            send_msg(0, "[$$]:Could not verify test results using xdsh($testxdsh_value) on second attempt, giving up...............");
+            send_msg(0, "[$$]:Could not verify runcmd test results using xdsh($testxdsh_value) on second attempt, giving up...............");
             exit 1;
         }
     }
@@ -128,9 +128,13 @@ if ($genesis_runcmd_test) {
 ##################################
 if ($genesis_runimg_test) {
     send_msg(2, "[$$]:Run nodeset NODE runimage test...............");
-    if (&testxdsh(&rungenesisimg)) {
-        send_msg(0, "[$$]:Could not verify test results using xdsh ...............");
-        exit 1;
+    my $testxdsh_value = &rungenesisimg;
+    if (&testxdsh($testxdsh_value)) {
+        send_msg(0, "[$$]:Could not verify runimage test results using xdsh($testxdsh_value) on first attmpt, will try again...............");
+        if (&testxdsh($testxdsh_value)) {
+            send_msg(0, "[$$]:Could not verify runimage test results using xdsh($testxdsh_value) on second attempt, giving up...............");
+            exit 1;
+        }
     }
 
     send_msg(2, "[$$]:Running runimage test success...............");