diff --git a/common/OpTestUtil.py b/common/OpTestUtil.py
index 62157a5a..fd1b5196 100644
--- a/common/OpTestUtil.py
+++ b/common/OpTestUtil.py
@@ -1807,7 +1807,7 @@ def handle_password(self, term_obj, pty, command):
                 raise CommandFailed(command, ''.join(failure_list_output), -1)
         return list_output, echo_rc
 
-    def run_command(self, term_obj, command, timeout=60, retry=0):
+    def run_command(self, term_obj, command, timeout=600, retry=5):
         # retry=0 will perform one pass
         counter = 0
         while counter <= retry:
diff --git a/testcases/PowerNVDump.py b/testcases/PowerNVDump.py
index a20b8e28..4c1ad75b 100644
--- a/testcases/PowerNVDump.py
+++ b/testcases/PowerNVDump.py
@@ -1144,7 +1144,6 @@ def runTest(self):
         self.cv_SYSTEM.goto_state(OpSystemState.OS)
         self.setup_test()
         log.info("=============== Testing kdump/fadump with xive=off ===============")
-        self.cv_SYSTEM.goto_state(OpSystemState.OS)
         obj = OpTestInstallUtil.InstallUtil()
         if not obj.update_kernel_cmdline(self.distro, args="xive=off",
                                          reboot=True, reboot_cmd=True):