diff --git a/homeassistant/helpers/condition.py b/homeassistant/helpers/condition.py
index 75bbfb12ddd9..b362429cb015 100644
--- a/homeassistant/helpers/condition.py
+++ b/homeassistant/helpers/condition.py
@@ -437,7 +437,7 @@ ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL_FOR = (
     ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL.extend(
         {
             vol.Required(CONF_OPTIONS, default={}): {
-                vol.Optional(CONF_FOR): cv.positive_time_period_dict,
+                vol.Optional(CONF_FOR): cv.positive_time_period,
             },
         }
     )
diff --git a/homeassistant/helpers/trigger.py b/homeassistant/helpers/trigger.py
index 5bcd97fbf4fc..1819e6d1f66a 100644
--- a/homeassistant/helpers/trigger.py
+++ b/homeassistant/helpers/trigger.py
@@ -345,7 +345,7 @@ ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST = ENTITY_STATE_TRIGGER_SCHEMA.extend(
             vol.Required(ATTR_BEHAVIOR, default=BEHAVIOR_ANY): vol.In(
                 [BEHAVIOR_FIRST, BEHAVIOR_LAST, BEHAVIOR_ANY]
             ),
-            vol.Optional(CONF_FOR): cv.positive_time_period_dict,
+            vol.Optional(CONF_FOR): cv.positive_time_period,
         },
     }
 )
diff --git a/tests/components/common.py b/tests/components/common.py
index d3d854e6855d..809a677b0d39 100644
--- a/tests/components/common.py
+++ b/tests/components/common.py
@@ -1167,9 +1167,10 @@ async def assert_condition_options_supported(
         )
 
     # Duration
-    await _validate_condition_options(
-        hass, condition, _merge({"for": {"seconds": 5}}), valid=supports_duration
-    )
+    for for_value in ({"seconds": 5}, "00:00:05", 5):
+        await _validate_condition_options(
+            hass, condition, _merge({"for": for_value}), valid=supports_duration
+        )
 
     # Unknown option should always be rejected
     await _validate_condition_options(
@@ -1230,9 +1231,10 @@ async def assert_trigger_options_supported(
         )
 
     # Duration
-    await _validate_trigger_options(
-        hass, trigger, _merge({"for": {"seconds": 5}}), valid=supports_duration
-    )
+    for for_value in ({"seconds": 5}, "00:00:05", 5):
+        await _validate_trigger_options(
+            hass, trigger, _merge({"for": for_value}), valid=supports_duration
+        )
 
     # Unknown option should always be rejected
     await _validate_trigger_options(