diff --git a/supervisor/discovery/services/ozw.py b/supervisor/discovery/services/ozw.py
index 0a5100337..aa0c7acb4 100644
--- a/supervisor/discovery/services/ozw.py
+++ b/supervisor/discovery/services/ozw.py
@@ -1,4 +1,4 @@
-"""Discovery service for Zwave MQTT."""
+"""Discovery service for OpenZwave MQTT."""
 import voluptuous as vol
 
 from supervisor.validate import network_port
@@ -8,9 +8,9 @@ from ..const import ATTR_HOST, ATTR_PASSWORD, ATTR_PORT, ATTR_USERNAME
 # pylint: disable=no-value-for-parameter
 SCHEMA = vol.Schema(
     {
-        vol.Required(ATTR_HOST): vol.Coerce(str),
+        vol.Required(ATTR_HOST): str,
         vol.Required(ATTR_PORT): network_port,
-        vol.Required(ATTR_USERNAME): vol.Coerce(str),
-        vol.Required(ATTR_PASSWORD): vol.Coerce(str),
+        vol.Required(ATTR_USERNAME): str,
+        vol.Required(ATTR_PASSWORD): str,
     }
 )
diff --git a/supervisor/discovery/services/zwave_js.py b/supervisor/discovery/services/zwave_js.py
new file mode 100644
index 000000000..979622f14
--- /dev/null
+++ b/supervisor/discovery/services/zwave_js.py
@@ -0,0 +1,14 @@
+"""Discovery service for Zwave JS."""
+import voluptuous as vol
+
+from supervisor.validate import network_port
+
+from ..const import ATTR_HOST, ATTR_PORT
+
+# pylint: disable=no-value-for-parameter
+SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_HOST): str,
+        vol.Required(ATTR_PORT): network_port,
+    }
+)
diff --git a/tests/discovery/test_ozw.py b/tests/discovery/test_ozw.py
index 78aa7860c..32169c597 100644
--- a/tests/discovery/test_ozw.py
+++ b/tests/discovery/test_ozw.py
@@ -1,4 +1,4 @@
-"""Test Zwave MQTT discovery."""
+"""Test OpenZwave MQTT discovery."""
 
 import pytest
 import voluptuous as vol
diff --git a/tests/discovery/test_zwave_js.py b/tests/discovery/test_zwave_js.py
new file mode 100644
index 000000000..30b00fab8
--- /dev/null
+++ b/tests/discovery/test_zwave_js.py
@@ -0,0 +1,22 @@
+"""Test Zwave JS discovery."""
+
+import pytest
+import voluptuous as vol
+
+from supervisor.discovery.validate import valid_discovery_config
+
+
+def test_good_config():
+    """Test good zwave js config."""
+
+    valid_discovery_config(
+        "zwave_js",
+        {"host": "test", "port": 3812},
+    )
+
+
+def test_bad_config():
+    """Test good zwave js config."""
+
+    with pytest.raises(vol.Invalid):
+        valid_discovery_config("zwave_js", {"host": "test"})