diff --git a/test/e2e/constants/onboarding.py b/test/e2e/constants/onboarding.py
index 2e06291c62..43f68fca96 100644
--- a/test/e2e/constants/onboarding.py
+++ b/test/e2e/constants/onboarding.py
@@ -5,7 +5,7 @@ from enum import Enum
 class OnboardingMessages(Enum):
     WRONG_LOGIN_LESS_LETTERS = 'Display Names must be at least 5 character(s) long'
     WRONG_LOGIN_SYMBOLS_NOT_ALLOWED = 'Invalid characters (use A-Z and 0-9, hyphens and underscores only)'
-    WRONG_PASSWORD = 'Password must be at least 10 characters long'
+    WRONG_PASSWORD = 'Minimum 10 character(s)'
     PASSWORDS_DONT_MATCH = "Passwords don't match"
     PASSWORD_INCORRECT = 'Password incorrect'
 
diff --git a/test/e2e/scripts/utils/generators.py b/test/e2e/scripts/utils/generators.py
index ff5f402ae8..63ad5e84ab 100644
--- a/test/e2e/scripts/utils/generators.py
+++ b/test/e2e/scripts/utils/generators.py
@@ -15,7 +15,7 @@ def random_name_string():
 def random_password_string():
     return ''.join((random.choice(
         string.ascii_letters + string.digits + string.punctuation)
-        for _ in range(10, 65))
+        for _ in range(10, 101))
     )
 
 
diff --git a/test/e2e/tests/settings/settings_password/test_settings_password_change_password.py b/test/e2e/tests/crtitical_tests_prs/test_settings_password_change_password.py
similarity index 94%
rename from test/e2e/tests/settings/settings_password/test_settings_password_change_password.py
rename to test/e2e/tests/crtitical_tests_prs/test_settings_password_change_password.py
index 67c50d67de..fa761d0620 100644
--- a/test/e2e/tests/settings/settings_password/test_settings_password_change_password.py
+++ b/test/e2e/tests/crtitical_tests_prs/test_settings_password_change_password.py
@@ -18,8 +18,7 @@ pytestmark = marks
                  'Change the password and login with new password')
 @pytest.mark.case(703005)
 @pytest.mark.parametrize('user_account', [RandomUser()])
-# @pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15178')
-# @pytest.mark.critical
+@pytest.mark.critical
 # TODO: follow up on https://github.com/status-im/status-desktop/issues/13013
 def test_change_password_and_login(aut: AUT, main_screen: MainWindow, user_account):
     with step('Open change password view'):
diff --git a/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py b/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py
index 5ef574734f..0f9a8cb412 100644
--- a/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py
+++ b/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py
@@ -116,7 +116,7 @@ def test_sign_up_with_wrong_password_length(user_account, error: str, aut: AUT,
 
     with step('Verify that button Create password is disabled and correct error appears'):
         assert create_password_view.is_create_password_button_enabled is False
-        assert create_password_view.password_error_message == error
+        assert str(create_password_view.password_error_message) == error
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/702994',
diff --git a/test/e2e/tests/settings/settings_password/__init__.py b/test/e2e/tests/settings/settings_password/__init__.py
deleted file mode 100644
index d6ff6247f2..0000000000
--- a/test/e2e/tests/settings/settings_password/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import pytest
-from .. import marks
-
-marks = [pytest.mark.settings_password, marks]
\ No newline at end of file