diff --git a/src/shared/condition.c b/src/shared/condition.c
index 3a09b493fc..5c6e383679 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -659,7 +659,7 @@ static int condition_test_firmware(Condition *c, char **env) {
                 _cleanup_free_ char *dtc_arg = NULL;
                 char *end;
 
-                end = strchr(arg, ')');
+                end = strrchr(arg, ')');
                 if (!end || *(end + 1) != '\0') {
                         log_debug("Malformed ConditionFirmware=%s", c->parameter);
                         return false;
@@ -676,7 +676,7 @@ static int condition_test_firmware(Condition *c, char **env) {
                 _cleanup_free_ char *smbios_arg = NULL;
                 char *end;
 
-                end = strchr(arg, ')');
+                end = strrchr(arg, ')');
                 if (!end || *(end + 1) != '\0')
                         return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Malformed ConditionFirmware=%s: %m", c->parameter);
 
diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index 6cb889c8d6..882b376f6f 100644
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -362,13 +362,13 @@ TEST(condition_test_firmware_smbios_field) {
         expression = strjoina("smbios-field(bios_vendor =$ ", quote,  bios_vendor, quote, ")");
         condition = condition_new(CONDITION_FIRMWARE, expression, false, false);
         assert_se(condition);
-        assert_se(condition_test(condition, environ));
+        assert_se(condition_test(condition, environ) > 0);
         condition_free(condition);
 
         expression = strjoina("smbios-field(bios_vendor=$", quote, bios_vendor, quote, ")");
         condition = condition_new(CONDITION_FIRMWARE, expression, false, false);
         assert_se(condition);
-        assert_se(condition_test(condition, environ));
+        assert_se(condition_test(condition, environ) > 0);
         condition_free(condition);
 
         expression = strjoina("smbios-field(bios_vendor !=$ ", quote, bios_vendor, quote, ")");
@@ -386,7 +386,7 @@ TEST(condition_test_firmware_smbios_field) {
         expression = strjoina("smbios-field(bios_vendor =$ ", quote,  bios_vendor, "*", quote, ")");
         condition = condition_new(CONDITION_FIRMWARE, expression, false, false);
         assert_se(condition);
-        assert_se(condition_test(condition, environ));
+        assert_se(condition_test(condition, environ) > 0);
         condition_free(condition);
 
         /* Test version comparison with bios_version, if available */
@@ -402,7 +402,7 @@ TEST(condition_test_firmware_smbios_field) {
         expression = strjoina("smbios-field(bios_version = ", quote, bios_version, quote, ")");
         condition = condition_new(CONDITION_FIRMWARE, expression, false, false);
         assert_se(condition);
-        assert_se(condition_test(condition, environ));
+        assert_se(condition_test(condition, environ) > 0);
         condition_free(condition);
 
         expression = strjoina("smbios-field(bios_version != ", quote, bios_version, quote, ")");
@@ -414,19 +414,19 @@ TEST(condition_test_firmware_smbios_field) {
         expression = strjoina("smbios-field(bios_version <= ", quote, bios_version, quote, ")");
         condition = condition_new(CONDITION_FIRMWARE, expression, false, false);
         assert_se(condition);
-        assert_se(condition_test(condition, environ));
+        assert_se(condition_test(condition, environ) > 0);
         condition_free(condition);
 
         expression = strjoina("smbios-field(bios_version >= ", quote, bios_version, quote, ")");
         condition = condition_new(CONDITION_FIRMWARE, expression, false, false);
         assert_se(condition);
-        assert_se(condition_test(condition, environ));
+        assert_se(condition_test(condition, environ) > 0);
         condition_free(condition);
 
         expression = strjoina("smbios-field(bios_version < ", quote, bios_version, ".1", quote, ")");
         condition = condition_new(CONDITION_FIRMWARE, expression, false, false);
         assert_se(condition);
-        assert_se(condition_test(condition, environ));
+        assert_se(condition_test(condition, environ) > 0);
         condition_free(condition);
 
         expression = strjoina("smbios-field(bios_version > ", quote, bios_version, ".1", quote, ")");