diff --git a/app/models/clusterscan.js b/app/models/clusterscan.js
index 60be9c0f7..b749c8038 100644
--- a/app/models/clusterscan.js
+++ b/app/models/clusterscan.js
@@ -121,16 +121,16 @@ const ClusterScan = Resource.extend({
   },
 
   getNodesAndStateForTestResult(testResult) {
+    const nodeNames = this.getNodeNamesFromNodeType(testResult.node_type);
+
     if (testResult.state === 'skip') {
       return {
-        nodes:       [],
+        nodes:       nodeNames,
         passedNodes: [],
         failedNodes: []
       }
     }
 
-    const nodeNames = this.getNodeNamesFromNodeType(testResult.node_type);
-
     if (testResult.state === 'pass') {
       return {
         nodes:       nodeNames,