diff --git a/homeassistant/components/http.py b/homeassistant/components/http.py
index 9539b1e45ee..46ef38d7423 100644
--- a/homeassistant/components/http.py
+++ b/homeassistant/components/http.py
@@ -123,7 +123,7 @@ def setup(hass, config=None):
 
     server_port = config[DOMAIN].get(CONF_SERVER_PORT, SERVER_PORT)
 
-    development = config[DOMAIN].get(CONF_DEVELOPMENT, "") == "1"
+    development = str(config[DOMAIN].get(CONF_DEVELOPMENT, "")) == "1"
 
     server = HomeAssistantHTTPServer(
         (server_host, server_port), RequestHandler, hass, api_password,
diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py
index 5f5d7b46256..d27e30f26c6 100644
--- a/homeassistant/components/zwave.py
+++ b/homeassistant/components/zwave.py
@@ -67,7 +67,7 @@ def setup(hass, config):
     from openzwave.option import ZWaveOption
     from openzwave.network import ZWaveNetwork
 
-    use_debug = config[DOMAIN].get(CONF_DEBUG) == '1'
+    use_debug = str(config[DOMAIN].get(CONF_DEBUG)) == '1'
 
     # Setup options
     options = ZWaveOption(