diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
index 036d4912ea..a75e243247 100644
--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
@@ -58,16 +58,11 @@ static int parse_argv(int argc, char *argv[]) {
                         assert_not_reached();
                 }
 
-        arg_command = argv[optind++];
-        if (!arg_command)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Command missing.");
-
-        arg_syspath = argv[optind++];
-        if (!arg_syspath)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "device is missing.");
+        if (argc != optind + 2)
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Expected two arguments: command string and device path.");
 
+        arg_command = ASSERT_PTR(argv[optind]);
+        arg_syspath = ASSERT_PTR(argv[optind+1]);
         return 1;
 }