diff --git a/playbooks/roles/test.nodepool-builder/tasks/main.yaml b/playbooks/roles/test.nodepool-builder/tasks/main.yaml
index 946d202..6971125 100644
--- a/playbooks/roles/test.nodepool-builder/tasks/main.yaml
+++ b/playbooks/roles/test.nodepool-builder/tasks/main.yaml
@@ -32,6 +32,7 @@
 - name: Ensure nodepool-builder is running
   become: true
   shell: /usr/sbin/service nodepool-builder status
+  when: nodepool_service_nodepool_builder_state in ['reloaded', 'restarted', 'started']
   changed_when: false
   tags:
     - skip_ansible_lint
diff --git a/playbooks/roles/test.nodepool-launcher/tasks/main.yaml b/playbooks/roles/test.nodepool-launcher/tasks/main.yaml
index e85cb08..6e4331d 100644
--- a/playbooks/roles/test.nodepool-launcher/tasks/main.yaml
+++ b/playbooks/roles/test.nodepool-launcher/tasks/main.yaml
@@ -32,6 +32,7 @@
 - name: Ensure nodepool-launcher is running
   become: true
   shell: /usr/sbin/service nodepool-launcher status
+  when: nodepool_service_nodepool_launcher_state in ['reloaded', 'restarted', 'started']
   changed_when: false
   tags:
     - skip_ansible_lint