diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
index 6845ddcd01..5194bf5809 100644
--- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
+++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
@@ -417,6 +417,16 @@ ntp/test_ntp.py::test_ntp_long_jump_disabled:
     strict: True
     reason: "Known NTP bug"
 
+#######################################
+#####       passw_hardening       #####
+#######################################
+passw_hardening/test_passw_hardening.py:
+  skip:
+    reason: "Password-hardening supported just in master version"
+    conditions:
+        - "release not in ['master']"
+        - https://github.com/sonic-net/sonic-mgmt/issues/6428
+
 #######################################
 #####           pc               #####
 #######################################
diff --git a/tests/passw_hardening/conftest.py b/tests/passw_hardening/conftest.py
index 5fa7cbcf97..a78d6dd014 100644
--- a/tests/passw_hardening/conftest.py
+++ b/tests/passw_hardening/conftest.py
@@ -17,12 +17,6 @@ def set_default_passw_hardening_policies(duthosts, enum_rand_one_per_hwsku_hostn
 
     test_passw_hardening.config_and_review_policies(duthost, passw_hardening_ob_dis, test_passw_hardening.PAM_PASSWORD_CONF_DEFAULT_EXPECTED)
 
-@pytest.fixture(scope="module", autouse=True)
-def passw_version_required(duthosts, enum_rand_one_per_hwsku_hostname):
-    duthost = duthosts[enum_rand_one_per_hwsku_hostname]
-    if not "master" in duthost.os_version:
-        pytest.skip("Password-hardening supported just in master version")
-
 @pytest.fixture(scope="function")
 def clean_passw_policies(duthosts, enum_rand_one_per_hwsku_hostname):
     yield