diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/commented.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/commented.fail.sh
index 95830eba0ab..aa776cf12db 100644
--- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/commented.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/commented.fail.sh
@@ -1,4 +1,17 @@
 #!/bin/bash
 # platform = multi_platform_ubuntu
 
-sed -i 's/\(^.*pam_pwquality\.so.*\)/# \1/' /etc/pam.d/common-password
+config_file=/usr/share/pam-configs/tmp_pwquality
+cat << EOF > "$config_file"
+Name: Pwquality password strength checking
+Default: yes
+Priority: 1025
+Conflicts: cracklib, pwquality
+Password-Type: Primary
+Password:
+    requisite                   # pam_pwquality.so
+EOF
+
+DEBIAN_FRONTEND=noninteractive pam-auth-update
+
+rm "$config_file"
diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/common.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/common.sh
deleted file mode 100644
index 02bd487048c..00000000000
--- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/common.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-{{% if 'ubuntu' in product %}}
-configuration_files=("common-password")
-{{% elif product in ['ol8', 'ol9', 'rhel8', 'rhel9'] %}}
-configuration_files=("password-auth" "system-auth")
-{{% else %}}
-configuration_files=("system-auth")
-{{% endif %}}
-
-
-{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9'] %}}
-authselect create-profile testingProfile --base-on sssd
-
-for file in ${configuration_files[@]}; do
-	sed -i --follow-symlinks "/pam_pwquality\.so/d" \
-		"/etc/authselect/custom/testingProfile/$file"
-done
-authselect select --force custom/testingProfile
-{{% elif 'ubuntu' in product %}}
-rm -f /usr/share/pam-configs/pwquality
-DEBIAN_FRONTEND=noninteractive pam-auth-update
-{{% else %}}
-for file in ${configuration_files[@]}; do
-	sed -i --follow-symlinks "/pam_pwquality\.so/d" "/etc/pam.d/$file"
-done
-{{% endif%}}
-
-truncate -s 0 /etc/security/pwquality.conf
diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/correct.pass.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/correct.pass.sh
index a74d14e7eb3..2410b572b43 100644
--- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/correct.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/correct.pass.sh
@@ -1,14 +1,17 @@
 #!/bin/bash
 # platform = multi_platform_ubuntu
 
-cat << EOF > /usr/share/pam-configs/pwquality
+config_file=/usr/share/pam-configs/tmp_pwquality
+cat << EOF > "$config_file"
 Name: Pwquality password strength checking
 Default: yes
-Priority: 1024
-Conflicts: cracklib
+Priority: 1025
+Conflicts: cracklib, pwquality
 Password-Type: Primary
 Password:
     requisite                   pam_pwquality.so
 EOF
 
 DEBIAN_FRONTEND=noninteractive pam-auth-update
+
+rm "$config_file"
diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/missing.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/missing.fail.sh
index feb4afc273d..d4fa608ae6b 100644
--- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/missing.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_enabled/tests/missing.fail.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 # platform = multi_platform_ubuntu
 
-source common.sh
+rm /usr/share/pam-configs/*pwquality
+
+DEBIAN_FRONTEND=noninteractive pam-auth-update