diff --git a/.gitignore b/.gitignore
index 716b8fd1d1..b72b96f4e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,11 @@ notarization.log
 status-desktop.log
 nim_status_client.log
 
+# Squish test ================================================================
+
+test/ui-test/testSuites/suite_status/config.xml
+test/ui-test/testSuites/suite_status/envvars
+
 
 # CPP app =====================================================================
 
diff --git a/test/ui-test/src/screens/StatusWelcomeScreen.py b/test/ui-test/src/screens/StatusWelcomeScreen.py
index 2152056382..8f4973ec2e 100644
--- a/test/ui-test/src/screens/StatusWelcomeScreen.py
+++ b/test/ui-test/src/screens/StatusWelcomeScreen.py
@@ -9,6 +9,7 @@
 # *****************************************************************************/
 
 from enum import Enum
+import sys
 from drivers.SquishDriver import *
 from drivers.SquishDriverVerification import *
 
@@ -84,7 +85,8 @@ class StatusWelcomeScreen:
         self.input_password(password)
         click_obj_by_name(SignUpComponents.FINALIZE_PASSWORD_STEP.value)
 
-        click_obj_by_name(SignUpComponents.PASSWORD_PREFERENCE.value)
+        if sys.platform == "darwin":
+            click_obj_by_name(SignUpComponents.PASSWORD_PREFERENCE.value)
 
     def input_username(self, username: str):
         type(SignUpComponents.USERNAME_INPUT.value, username)
@@ -99,7 +101,9 @@ class StatusWelcomeScreen:
         click_obj_by_name(SignUpComponents.CREATE_PASSWORD.value)
         
     def _agree_terms_and_conditions(self):
-        click_obj_by_name(AgreementPopUp.OK_GOT_IT_BUTTON.value)
+        if sys.platform == "darwin":
+            click_obj_by_name(AgreementPopUp.OK_GOT_IT_BUTTON.value)
+
         click_obj_by_name(AgreementPopUp.ACKNOWLEDGE_CHECKBOX.value)
         check_obj_by_name(AgreementPopUp.TERMS_OF_USE_CHECK_BOX.value)
         click_obj_by_name(AgreementPopUp.GET_STARTED_BUTTON.value)
diff --git a/test/ui-test/testSuites/suite_status/config.xml b/test/ui-test/testSuites/suite_status/config.xml
deleted file mode 100644
index 1a15105de3..0000000000
--- a/test/ui-test/testSuites/suite_status/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<testconfig version="1.0">
-    <information>
-        <summary/>
-        <description/>
-    </information>
-    <testsettings/>
-    <passwords/>
-</testconfig>
diff --git a/test/ui-test/testSuites/suite_status/envvars b/test/ui-test/testSuites/suite_status/envvars
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/ui-test/testSuites/suite_status/shared/scripts/bdd_hooks.py b/test/ui-test/testSuites/suite_status/shared/scripts/bdd_hooks.py
index 9208b5c63b..d2270c64a4 100644
--- a/test/ui-test/testSuites/suite_status/shared/scripts/bdd_hooks.py
+++ b/test/ui-test/testSuites/suite_status/shared/scripts/bdd_hooks.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # This file contains hook functions to run as the .feature file is executed.
 
+sys.path.append(os.path.join(os.path.dirname(__file__), "../../../src/"))
+
 
 from utils.FileManager import *
 
-sys.path.append(os.path.join(os.path.dirname(__file__), "../../../src/"))
-
 
 _statusDektopAppName = "nim_status_client"
 _appClosureTimeout = 2 #[seconds]
diff --git a/test/ui-test/testSuites/suite_status/shared/steps/steps.py b/test/ui-test/testSuites/suite_status/shared/steps/steps.py
index 1146605815..76596b0f74 100644
--- a/test/ui-test/testSuites/suite_status/shared/steps/steps.py
+++ b/test/ui-test/testSuites/suite_status/shared/steps/steps.py
@@ -14,11 +14,12 @@
 # *          with a pattern which is matched against the steps being executed.
 # *****************************************************************************
 from common.Common import *
-
+import time
 
 @When("the user restarts the app")
 def step(context):
-    waitFor(lambda: currentApplicationContext().detach(), 100)
+    waitFor(lambda: currentApplicationContext().detach(), 500)
+    time.sleep(5)
     startApplication("nim_status_client")