diff --git a/qa/smoke-test-client/pom.xml b/qa/smoke-test-client/pom.xml
index 1daec63add0..df48afa2287 100644
--- a/qa/smoke-test-client/pom.xml
+++ b/qa/smoke-test-client/pom.xml
@@ -21,7 +21,6 @@
     <artifactId>smoke-test-client</artifactId>
     <name>QA: Smoke Test Client</name>
     <description>Test the Java Client against a running cluster</description>
-    <packaging>pom</packaging>
 
     <properties>
         <skip.unit.tests>true</skip.unit.tests>
diff --git a/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java b/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java
index dbf51f0f739..4c324b0f1a9 100644
--- a/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java
+++ b/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java
@@ -25,6 +25,7 @@ import org.elasticsearch.client.Client;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.greaterThan;
 
 public class SmokeTestClientIT extends ESSmokeClientTestCase {
 
@@ -37,8 +38,10 @@ public class SmokeTestClientIT extends ESSmokeClientTestCase {
 
         // START SNIPPET: java-doc-admin-cluster-health
         ClusterHealthResponse health = client.admin().cluster().prepareHealth().setWaitForYellowStatus().get();
+        String clusterName = health.getClusterName();
+        int numberOfNodes = health.getNumberOfNodes();
         // END SNIPPET: java-doc-admin-cluster-health
-        assertThat(health.getClusterName(), is("elasticsearch"));
+        assertThat("cluster [" + clusterName + "] should have at least 1 node", numberOfNodes, greaterThan(0));
     }
 
     /**