diff --git a/test-case/check-sof-logger.sh b/test-case/check-sof-logger.sh
index 00cd8ee5..87817e38 100755
--- a/test-case/check-sof-logger.sh
+++ b/test-case/check-sof-logger.sh
@@ -71,7 +71,10 @@ sof_alsa_card_found()
     # note: assumes SOF card names to start with "sof", e.g.
     #   - /proc/asound/sofsoundwire/id
     #   - /proc/asound/sofhdadsp/id
-    test -e /proc/asound/sof*/id
+    for i in /proc/asound/sof*/id; do
+        if test -e "$i"; then return 0; fi
+    done
+    return 1
 }
 
 wait_for_sof_alsa_card()
diff --git a/test-case/verify-kernel-boot-log.sh b/test-case/verify-kernel-boot-log.sh
index a4138da2..c8d1d168 100755
--- a/test-case/verify-kernel-boot-log.sh
+++ b/test-case/verify-kernel-boot-log.sh
@@ -115,7 +115,8 @@ dmic_switch_present()
     (set -x
      # name= is hardcoded in /usr/share/alsa/ucm2/*
      # This returns a non-zero error status on failure
-     amixer cget name='Dmic0 Capture Switch'
+     switch=$(aplay -l | head -2 | tail -1 | awk '{print $3}')
+     amixer -c "$switch" cget name='Dmic0 Capture Switch'
     )
 }