diff --git a/tests/run-test.sh b/tests/run-test.sh
index f1163d1..cfce859 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -59,9 +59,17 @@ if [ -n "$test_basic" ]; then
     # TestFirewall.testNetworkingPage is still too unstable
     TESTS="$TESTS TestFirewall.test{AddCustomServices,AddServices,FirewallPage,MultipleZones}"
 
+# testExpired in RHEL 8 is a PAM bug -- it shouldn't pwquality the old password when having to set a new one, that's completely counter-productive and wrong
+    if [ "${TEST_OS#rhel}" != "$TEST_OS" ]; then
+        TESTS="$TESTS
+            TestLogin.test{Basic,Conversation,FailingWebsocket,FailingWebsocketSafari,FailingWebsocketSafariNoCA,Logging,Raw,SELinuxRestrictedUser,SessionRecordingShell,UnsupportedBrowser}"
+    else
+        TESTS="$TESTS
+            TestLogin"
+    fi
+
     TESTS="$TESTS
         TestAccounts
-        TestLogin
         TestNetworking
         TestSOS"
 fi