diff --git a/homeassistant/components/alarm_control_panel/demo.py b/homeassistant/components/alarm_control_panel/demo.py
index 00dae5c2779..aa90fe1f889 100644
--- a/homeassistant/components/alarm_control_panel/demo.py
+++ b/homeassistant/components/alarm_control_panel/demo.py
@@ -7,7 +7,7 @@ https://home-assistant.io/components/demo/
 import homeassistant.components.alarm_control_panel.manual as manual
 from homeassistant.const import (
     STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_TRIGGERED, CONF_PENDING_TIME)
+    STATE_ALARM_ARMED_CUSTOM_BYPASS, STATE_ALARM_TRIGGERED, CONF_PENDING_TIME)
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -23,6 +23,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             STATE_ALARM_ARMED_NIGHT: {
                 CONF_PENDING_TIME: 5
             },
+            STATE_ALARM_ARMED_CUSTOM_BYPASS: {
+                CONF_PENDING_TIME: 5
+            },
             STATE_ALARM_TRIGGERED: {
                 CONF_PENDING_TIME: 5
             },
diff --git a/tests/components/alarm_control_panel/test_manual.py b/tests/components/alarm_control_panel/test_manual.py
index 2e96b81bfce..d65568b0844 100644
--- a/tests/components/alarm_control_panel/test_manual.py
+++ b/tests/components/alarm_control_panel/test_manual.py
@@ -1,7 +1,9 @@
 """The tests for the manual Alarm Control Panel component."""
 from datetime import timedelta
 import unittest
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
+from homeassistant.components.alarm_control_panel import demo
+
 
 from homeassistant.setup import setup_component
 from homeassistant.const import (
@@ -27,6 +29,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         """Stop down everything that was started."""
         self.hass.stop()
 
+    def test_setup_demo_platform(self):
+        """Test setup."""
+        mock = MagicMock()
+        add_devices = mock.MagicMock()
+        demo.setup_platform(self.hass, {}, add_devices)
+        self.assertEquals(add_devices.call_count, 1)
+
     def test_arm_home_no_pending(self):
         """Test arm home method."""
         self.assertTrue(setup_component(