diff --git a/esphomeyaml/components/deep_sleep.py b/esphomeyaml/components/deep_sleep.py
index 7019c4d718..5137b62105 100644
--- a/esphomeyaml/components/deep_sleep.py
+++ b/esphomeyaml/components/deep_sleep.py
@@ -49,8 +49,11 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Required(CONF_PINS): cv.ensure_list(pins.shorthand_input_pin, validate_pin_number),
         vol.Required(CONF_MODE): cv.one_of(*EXT1_WAKEUP_MODES, upper=True),
     })),
-    vol.Optional(CONF_RUN_CYCLES): cv.positive_int,
     vol.Optional(CONF_RUN_DURATION): cv.positive_time_period_milliseconds,
+
+    vol.Optional(CONF_RUN_CYCLES): cv.invalid("The run_cycles option has been removed in 1.11.0 as "
+                                              "it was essentially the same as a run_duration of 0s."
+                                              "Please use run_duration now.")
 }).extend(cv.COMPONENT_SCHEMA.schema)
 
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 0ad6e07621..7694dbb973 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -137,7 +137,6 @@ power_supply:
 
 deep_sleep:
   run_duration: 20s
-  run_cycles: 500
   sleep_duration: 50s
   wakeup_pin: GPIO39
   wakeup_pin_mode: INVERT_WAKEUP