diff --git a/homeassistant/components/zwave/discovery_schemas.py b/homeassistant/components/zwave/discovery_schemas.py
index f38bc308649863..26a5d1c4758c4f 100644
--- a/homeassistant/components/zwave/discovery_schemas.py
+++ b/homeassistant/components/zwave/discovery_schemas.py
@@ -92,7 +92,7 @@
              const.DISC_INDEX: [const.INDEX_SWITCH_MULTILEVEL_DIM],
              const.DISC_OPTIONAL: True,
          }})},
-    {const.DISC_COMPONENT: 'cover',  # Garage Door Switch
+    {const.DISC_COMPONENT: 'cover',  # Garage Door
      const.DISC_GENERIC_DEVICE_CLASS: [
          const.GENERIC_TYPE_SWITCH_MULTILEVEL,
          const.GENERIC_TYPE_ENTRY_CONTROL],
@@ -105,25 +105,11 @@
          const.SPECIFIC_TYPE_SECURE_DOOR],
      const.DISC_VALUES: dict(DEFAULT_VALUES_SCHEMA, **{
          const.DISC_PRIMARY: {
-             const.DISC_COMMAND_CLASS: [const.COMMAND_CLASS_SWITCH_BINARY],
+             const.DISC_COMMAND_CLASS: [
+                 const.COMMAND_CLASS_BARRIER_OPERATOR,
+                 const.COMMAND_CLASS_SWITCH_BINARY],
              const.DISC_GENRE: const.GENRE_USER,
          }})},
-    {const.DISC_COMPONENT: 'cover',  # Garage Door Barrier
-     const.DISC_GENERIC_DEVICE_CLASS: [
-         const.GENERIC_TYPE_SWITCH_MULTILEVEL,
-         const.GENERIC_TYPE_ENTRY_CONTROL],
-     const.DISC_SPECIFIC_DEVICE_CLASS: [
-         const.SPECIFIC_TYPE_CLASS_A_MOTOR_CONTROL,
-         const.SPECIFIC_TYPE_CLASS_B_MOTOR_CONTROL,
-         const.SPECIFIC_TYPE_CLASS_C_MOTOR_CONTROL,
-         const.SPECIFIC_TYPE_MOTOR_MULTIPOSITION,
-         const.SPECIFIC_TYPE_SECURE_BARRIER_ADDON,
-         const.SPECIFIC_TYPE_SECURE_DOOR],
-     const.DISC_VALUES: dict(DEFAULT_VALUES_SCHEMA, **{
-         const.DISC_PRIMARY: {
-             const.DISC_COMMAND_CLASS: [const.COMMAND_CLASS_BARRIER_OPERATOR],
-             const.DISC_INDEX: [const.INDEX_BARRIER_OPERATOR_LABEL],
-         }})},
     {const.DISC_COMPONENT: 'fan',
      const.DISC_GENERIC_DEVICE_CLASS: [
          const.GENERIC_TYPE_SWITCH_MULTILEVEL],