1 files changed, 7 insertions, 1 deletions

diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown
index e36b4a983d..bc08cf0fdc 100755
--- a/scripts/qemuimage-tests/sanity/shutdown
+++ b/scripts/qemuimage-tests/sanity/shutdown
@@ -13,7 +13,8 @@
 
 . $POKYBASE/scripts/qemuimage-testlib
 
-TIMEOUT=360
+TIMEOUT=400
+
 RET=1
 i=0
 
@@ -61,6 +62,11 @@ fi
 if [ ${RET} -eq 0 ]; then
         Test_Info "Shutdown Test PASS"
         Test_Print_Result "shutdown" 0
+        
+        # Remove TARGET_IPSAVE since no existing qemu running now
+        if [ -e ${TARGET_IPSAVE} ]; then
+                rm -rf ${TARGET_IPSAVE}
+        fi
         exit 0
 else
         Test_Info "Shutdown Test FAIL"