diff --git a/needles/rocky-anaconda_install_weak_password-arabic-20231116.json b/needles/rocky-anaconda_install_weak_password-arabic-20231116.json
new file mode 100644
index 00000000..83079cdc
--- /dev/null
+++ b/needles/rocky-anaconda_install_weak_password-arabic-20231116.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 650,
+      "ypos": 743,
+      "width": 335,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-arabic",
+    "anaconda_install_weak_password"
+  ]
+}
\ No newline at end of file
diff --git a/needles/rocky-anaconda_install_weak_password-arabic-20231116.png b/needles/rocky-anaconda_install_weak_password-arabic-20231116.png
new file mode 100644
index 00000000..204d5e13
Binary files /dev/null and b/needles/rocky-anaconda_install_weak_password-arabic-20231116.png differ
diff --git a/needles/rocky-anaconda_install_weak_password-russian-20231116.json b/needles/rocky-anaconda_install_weak_password-russian-20231116.json
new file mode 100644
index 00000000..7c63e73f
--- /dev/null
+++ b/needles/rocky-anaconda_install_weak_password-russian-20231116.json
@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "height": 11,
+      "width": 36,
+      "type": "match",
+      "ypos": 145,
+      "xpos": 398
+    },
+    {
+      "xpos": 43,
+      "ypos": 746,
+      "width": 393,
+      "height": 11,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-russian",
+    "anaconda_install_weak_password"
+  ]
+}
\ No newline at end of file
diff --git a/needles/rocky-anaconda_install_weak_password-russian-20231116.png b/needles/rocky-anaconda_install_weak_password-russian-20231116.png
new file mode 100644
index 00000000..4cdf6b6e
Binary files /dev/null and b/needles/rocky-anaconda_install_weak_password-russian-20231116.png differ
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 3559b9ff..5af0832c 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -65,6 +65,9 @@ sub _do_root_and_user {
     # Check username (and hence keyboard layout) if non-English
     if (get_var('LANGUAGE')) {
         assert_screen "anaconda_install_user_created";
+        if (check_screen "anaconda_install_weak_password") {
+            assert_and_click "anaconda_spoke_done";
+        }
     }
 }
 
diff --git a/tests/slurm.pm b/tests/slurm.pm
index 3dfceca0..075f485a 100644
--- a/tests/slurm.pm
+++ b/tests/slurm.pm
@@ -9,17 +9,17 @@ sub slurm_setup {
     assert_script_run "dnf -y install rocky-release-hpc", 120;
 
     # Set up munge
-    assert_script_run "dnf -y install munge", 120;
+    assert_script_run 'dnf -y install munge --releasever=' . get_version_major, 120;
     assert_script_run "dd if=/dev/urandom bs=1 count=1024 >/etc/munge/munge.key";
     assert_script_run "chmod 400 /etc/munge/munge.key";
     assert_script_run "chown munge.munge /etc/munge/munge.key";
     assert_script_run "systemctl enable --now munge.service";
 
     # install slurm
-    if (get_var("CURRREL") eq '8') {
+    if (get_version_major() eq '8') {
         assert_script_run "dnf config-manager --set-enabled powertools";
     }
-    assert_script_run "dnf install -y slurm$version-slurmdbd slurm$version-slurmrestd slurm$version-slurmctld slurm$version-slurmd";
+    assert_script_run "dnf install -y slurm$version-slurmdbd slurm$version-slurmrestd slurm$version-slurmctld slurm$version-slurmd  --releasever=" . get_version_major;
 
     # Since this is a single node system, we don't have to modify the conf files. We will for larger multi-node tests.
     # start services