diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json
index f394537803a..9533c82f2c1 100644
--- a/homeassistant/components/zwave_js/manifest.json
+++ b/homeassistant/components/zwave_js/manifest.json
@@ -9,7 +9,7 @@
   "iot_class": "local_push",
   "loggers": ["zwave_js_server"],
   "quality_scale": "platinum",
-  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.57.0"],
+  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.58.0"],
   "usb": [
     {
       "vid": "0658",
diff --git a/requirements_all.txt b/requirements_all.txt
index d448648bb31..05538d60ae0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -3053,7 +3053,7 @@ ziggo-mediabox-xl==1.1.0
 zm-py==0.5.4
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.57.0
+zwave-js-server-python==0.58.0
 
 # homeassistant.components.zwave_me
 zwave-me-ws==0.4.3
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 67029d52bf6..6e83f5b8426 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -2424,7 +2424,7 @@ zeversolar==0.3.1
 zha==0.0.32
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.57.0
+zwave-js-server-python==0.58.0
 
 # homeassistant.components.zwave_me
 zwave-me-ws==0.4.3
diff --git a/tests/components/zwave_js/test_lock.py b/tests/components/zwave_js/test_lock.py
index e8a8a2035d8..274444d813e 100644
--- a/tests/components/zwave_js/test_lock.py
+++ b/tests/components/zwave_js/test_lock.py
@@ -95,7 +95,9 @@ async def test_door_lock(
     )
     node.receive_event(event)
 
-    assert hass.states.get(SCHLAGE_BE469_LOCK_ENTITY).state == STATE_LOCKED
+    state = hass.states.get(SCHLAGE_BE469_LOCK_ENTITY)
+    assert state
+    assert state.state == STATE_LOCKED
 
     client.async_send_command.reset_mock()
 
@@ -194,6 +196,7 @@ async def test_door_lock(
             "insideHandlesCanOpenDoorConfiguration": [True, True, True, True],
             "operationType": 2,
             "outsideHandlesCanOpenDoorConfiguration": [True, True, True, True],
+            "lockTimeoutConfiguration": 1,
         }
     ]
     assert args["commandClass"] == 98
@@ -239,6 +242,7 @@ async def test_door_lock(
             "insideHandlesCanOpenDoorConfiguration": [True, True, True, True],
             "operationType": 2,
             "outsideHandlesCanOpenDoorConfiguration": [True, True, True, True],
+            "lockTimeoutConfiguration": 1,
         }
     ]
     assert args["commandClass"] == 98
@@ -294,7 +298,9 @@ async def test_door_lock(
     node.receive_event(event)
 
     assert node.status == NodeStatus.DEAD
-    assert hass.states.get(SCHLAGE_BE469_LOCK_ENTITY).state == STATE_UNAVAILABLE
+    state = hass.states.get(SCHLAGE_BE469_LOCK_ENTITY)
+    assert state
+    assert state.state == STATE_UNAVAILABLE
 
 
 async def test_only_one_lock(