diff --git a/psh/test.yaml b/psh/test.yaml
index 8aeca9c5..139d7c07 100644
--- a/psh/test.yaml
+++ b/psh/test.yaml
@@ -12,69 +12,87 @@ test:
 
         - name: auth
           harness: test-auth.py
+          reboot: True
 
         #FIXME - test-pshlogin.py is only for targets with root
         - name: pshlogin
           harness: test-pshlogin.py
+          reboot: True
           targets:
               exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk, armv7m4-stm32l4x6-nucleo, riscv64-generic-qemu]
 
         - name: echo
           harness: test-echo.py
+          reboot: True
 
         - name: date
           harness: test-date.py
+          reboot: True
 
         - name: prompt
           harness: test-prompt.py
+          reboot: True
 
         - name: autocompletion
           harness: test-autocompletion.py
+          reboot: True
 
         - name: ps
           harness: test-ps.py
+          reboot: True
 
         - name: cat
           harness: test-cat.py
+          reboot: True
 
         - name: cat-shells
           harness: test-cat-shells.py
+          reboot: True
           targets:
               exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk, armv7m4-stm32l4x6-nucleo, riscv64-generic-qemu]
 
         - name: kill
           harness: test-kill.py
+          reboot: True
 
         - name: mkdir
           harness: test-mkdir.py
+          reboot: True
 
         - name: touch
           harness: test-touch.py
+          reboot: True
 
         - name: touch-rootfs
           harness: test-touch-rootfs.py
+          reboot: True
           targets:
               exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk, armv7m4-stm32l4x6-nucleo, riscv64-generic-qemu]
 
         - name: ls
           harness: test-ls.py
+          reboot: True
 
         - name: ls-rootfs
           harness: test-ls-rootfs.py
+          reboot: True
           targets:
               exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk, armv7m4-stm32l4x6-nucleo, riscv64-generic-qemu]
 
         - name: runfile
           harness: test-runfile.py
+          reboot: True
           targets:
               # runfile applet is not intended for non-rootfs targets
               exclude: [armv7m7-imxrt106x-evk, armv7m7-imxrt117x-evk, armv7m4-stm32l4x6-nucleo, riscv64-generic-qemu]
 
         - name: history
           harness: test-history.py
+          reboot: True
 
         - name: help
           harness: test-help.py
+          reboot: True
 
         - name: exit
           targets:
diff --git a/trunner/target/armv7a9.py b/trunner/target/armv7a9.py
index a58de493..186100d6 100644
--- a/trunner/target/armv7a9.py
+++ b/trunner/target/armv7a9.py
@@ -27,6 +27,13 @@
 class ARMv7A9TargetRebooter(Rebooter):
     # TODO add text mode reboot
 
+    def _reboot_soft(self):
+        self.host.set_reset(0)
+        time.sleep(0.05)
+        self.dut.clear_buffer()
+        self.host.set_reset(1)
+        time.sleep(0.05)
+
     def _reboot_hard(self):
         self.host.set_power(False)
         # optimal power off time to prevent sustaining chips, e.g. flash memory, related to #540 issue