diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c
index 4081976ca3..2447edad19 100644
--- a/src/udev/udevadm-util.c
+++ b/src/udev/udevadm-util.c
@@ -72,6 +72,10 @@ int find_device(const char *id, const char *prefix, sd_device **ret) {
                         return 0;
         }
 
+        /* if a path is provided, then it cannot be a unit name. Let's return earlier. */
+        if (is_path(id))
+                return -ENODEV;
+
         /* Check if the argument looks like a device unit name. */
         return find_device_from_unit(id, ret);
 }
diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index 0d4c4ff776..df92a0bb43 100755
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -289,8 +289,9 @@ EOF
 }
 
 testcase_simultaneous_events() {
-    local disk expected i iterations link num_part part partscript rule target timeout
+    local disk expected i iterations key link num_part part partscript rule target timeout
     local -a devices symlinks
+    local -A running
 
     if [[ -n "${ASAN_OPTIONS:-}" ]] || [[ "$(systemd-detect-virt -v)" == "qemu" ]]; then
         num_part=2
@@ -346,11 +347,12 @@ EOF
             else
                 udevadm lock --device="${devices[$disk]}" sfdisk -q -X gpt "${devices[$disk]}" <"$partscript" &
             fi
+            running[$disk]=$!
         done
 
-        # Wait for the above sfdisk commands to be finished.
-        for disk in {0..9}; do
-            udevadm lock --device="${devices[$disk]}" true
+        for key in "${!running[@]}"; do
+            wait "${running[$key]}"
+            unset "running[$key]"
         done
 
         if ((i % 10 <= 1)); then