diff --git a/test/TEST-35-LOGIN/test.sh b/test/TEST-35-LOGIN/test.sh
index 808f94a58ff..a781be7b3c5 100755
--- a/test/TEST-35-LOGIN/test.sh
+++ b/test/TEST-35-LOGIN/test.sh
@@ -9,6 +9,8 @@ TEST_DESCRIPTION="Tests for systemd-logind"
 
 test_append_files() {
     image_install -o evemu-device evemu-event
+    instmods uinput
+    generate_module_dependencies
 }
 
 do_test "$@"
diff --git a/test/TEST-54-CREDS/test.sh b/test/TEST-54-CREDS/test.sh
index 5269eaa437e..443be8761e0 100755
--- a/test/TEST-54-CREDS/test.sh
+++ b/test/TEST-54-CREDS/test.sh
@@ -32,6 +32,9 @@ KERNEL_APPEND="${KERNEL_APPEND:-} ${KERNEL_CREDS[*]}"
 
 test_append_files() {
     instmods qemu_fw_cfg
+    if get_bool "$LOOKS_LIKE_SUSE"; then
+        instmods dmi-sysfs
+    fi
     generate_module_dependencies
 }
 
diff --git a/test/test-functions b/test/test-functions
index 3a2a59758f7..06431347cc1 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -966,13 +966,10 @@ install_modules() {
     instmods loop =block
     instmods nls_ascii =nls
     instmods overlay =overlayfs
-    # for TEST-35-LOGIN
-    instmods scsi_debug uinput
+    instmods scsi_debug
 
     if get_bool "$LOOKS_LIKE_SUSE"; then
         instmods ext4
-        # for TEST-54-CREDS
-        instmods dmi-sysfs
     fi
 }