diff --git a/scripts/installtests/agent_upstart_teardown.py b/scripts/installtests/agent_upstart_teardown.py
index 3b4a6a5d4b..dc750a2eb1 100644
--- a/scripts/installtests/agent_upstart_teardown.py
+++ b/scripts/installtests/agent_upstart_teardown.py
@@ -424,7 +424,7 @@ remove_safe_profile_state_dir() { builtin command rm -r -- "$SAFE_PROFILE_STATE_
         self.assertLess(admission, remote)
         self.assertLess(remote, retirement)
         self.assertLess(retirement, erase)
-        self.assertIn('[[ "$uninstall_upstart" != true ]]', entry)
+        self.assertIn('[[ "$uninstall_upstart" != true && -z "$uninstall_nas_platform" ]]', entry)
         self.assertFalse('initctl stop' in entry)
         self.assertNotIn('initctl start', definitions(self.source))
 
diff --git a/scripts/installtests/install_sh_test.go b/scripts/installtests/install_sh_test.go
index 14a1b81ee9..ac1a77e06b 100644
--- a/scripts/installtests/install_sh_test.go
+++ b/scripts/installtests/install_sh_test.go
@@ -1830,7 +1830,9 @@ func TestInstallSHUsesQNAPStateForUninstallRecovery(t *testing.T) {
 		`qnap_state_dir=$(find_qnap_state_dir || true)`,
 		`aid_paths+=("$qnap_state_dir/agent-id")`,
 		`if [[ -n "$qnap_state_dir" ]] && trusted_connection_state_file "$qnap_state_dir/connection.env"; then`,
-		`remove_qnap_autorun_block "$AUTORUN_PATH"`,
+		`uninstall_nas_platform=$(nas_agent_removal_platform || true)`,
+		`teardown_nas_agent_boot_owner "$uninstall_nas_platform"`,
+		`nas_agent_boot_operation "$platform" observe`,
 	}
 	for _, needle := range required {
 		if !strings.Contains(script, needle) {