diff --git a/panels/config/zwave/ha-config-zwave.html b/panels/config/zwave/ha-config-zwave.html
index 146ac6512..cfe87b711 100644
--- a/panels/config/zwave/ha-config-zwave.html
+++ b/panels/config/zwave/ha-config-zwave.html
@@ -172,7 +172,32 @@
               service='print_node'
               hidden$='[[!showHelp]]'
             ></ha-service-description>
+            
+            <ha-call-service-button
+              hass='[[hass]]'
+              domain='zwave'
+              service='heal_node'
+              service-data=[[computeHealNodeServiceData(selectedNode)]]
+            >Heal Node</ha-call-service-button>
+            <ha-service-description
+              hass='[[hass]]'
+              domain='zwave'
+              service='heal_node'
+              hidden$='[[!showHelp]]'
+            ></ha-service-description>
 
+            <ha-call-service-button
+              hass='[[hass]]'
+              domain='zwave'
+              service='test_node'
+              service-data=[[computeNodeServiceData(selectedNode)]]
+            >Test Node</ha-call-service-button>
+            <ha-service-description
+              hass='[[hass]]'
+              domain='zwave'
+              service='test_node'
+              hidden$='[[!showHelp]]'
+            ></ha-service-description>
           </div>
           <div class='card-actions'>
             <paper-input
@@ -521,6 +546,13 @@ class HaConfigZwave extends Polymer.Element {
     return { node_id: this.nodes[selectedNode].attributes.node_id };
   }
 
+  computeHealNodeServiceData(selectedNode) {
+    return {
+      node_id: this.nodes[selectedNode].attributes.node_id,
+      return_routes: true
+    };
+  }
+
   computeGetNodeName(selectedNode) {
     if (this.selectedNode === -1 ||
       !this.nodes[selectedNode].entity_id) return -1;