diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index 535e337e17c..6e373d8207e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -5228,6 +5228,7 @@ public void testClientServiceSmokeTests() throws Exception {
     createService(cluster1, serviceGroupName, serviceName, repositoryVersion01, null);
     String componentName1 = "PIG";
     createServiceComponent(cluster1, serviceGroupName, serviceName, componentName1, State.INIT);
+    createServiceComponent(cluster1, serviceGroupName, serviceName, "SOME_CLIENT_FOR_SERVICE_CHECK", State.INIT);
 
     String host1 = getUniqueName();
     String host2 = getUniqueName();
@@ -5243,6 +5244,8 @@ public void testClientServiceSmokeTests() throws Exception {
         host1, null);
     createServiceComponentHost(cluster1, serviceGroupName, null, componentName1,
         host2, null);
+    createServiceComponentHost(cluster1, serviceGroupName, null, "SOME_CLIENT_FOR_SERVICE_CHECK",
+        host2, null);
 
     ServiceRequest r = new ServiceRequest(cluster1, serviceGroupName, serviceName, repositoryVersion01.getId(),
         State.INSTALLED.toString(), null);
@@ -5266,7 +5269,7 @@ public void testClientServiceSmokeTests() throws Exception {
     }
 
     List<ShortTaskStatus> taskStatuses = trackAction.getTasks();
-    Assert.assertEquals(2, taskStatuses.size());
+    Assert.assertEquals(3, taskStatuses.size());
 
     List<Stage> stages = actionDB.getAllStages(trackAction.getRequestId());
     Assert.assertEquals(1, stages.size());
@@ -5326,9 +5329,11 @@ public void testSkipTaskOnUnhealthyHosts() throws Exception {
     createService(cluster1, serviceGroupName, serviceName, null);
     String componentName1 = "NAMENODE";
     String componentName2 = "DATANODE";
+    String componentName3 = "HDFS_CLIENT";
 
     createServiceComponent(cluster1, serviceGroupName, serviceName, componentName1, State.INIT);
     createServiceComponent(cluster1, serviceGroupName, serviceName, componentName2, State.INIT);
+    createServiceComponent(cluster1, serviceGroupName, serviceName, componentName3, State.INIT);
 
     String host1 = getUniqueName();
     String host2 = getUniqueName();
@@ -5344,6 +5349,8 @@ public void testSkipTaskOnUnhealthyHosts() throws Exception {
         host2, null);
     createServiceComponentHost(cluster1, serviceGroupName, serviceName, componentName2,
         host3, null);
+    createServiceComponentHost(cluster1, serviceGroupName, serviceName, componentName3,
+        host2, null);
 
     // Install
     installService(cluster1, serviceGroupName, serviceName, false, false);
@@ -6018,6 +6025,9 @@ public void testResourceFiltersWithCustomCommands() throws Exception {
     ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.0.6");
     Service hdfs = cluster.addService(serviceGroup, "HDFS", "HDFS", repositoryVersion);
     Service mapred = cluster.addService(serviceGroup, "YARN", "YARN", repositoryVersion);
+    Service hadoop_clients = cluster.addService(serviceGroup, "HADOOP_CLIENTS", "HADOOP_CLIENTS", repositoryVersion);
+
+    hdfs = cluster.addDependencyToService("CORE", "HDFS", hadoop_clients.getServiceId());
 
     hdfs.addServiceComponent(Role.HDFS_CLIENT.name());
     hdfs.addServiceComponent(Role.NAMENODE.name());
@@ -6116,6 +6126,11 @@ public void testResourceFiltersWithCustomCommands() throws Exception {
     }
 
     // Test service checks - specific host
+
+    hadoop_clients.addServiceComponent("SOME_CLIENT_FOR_SERVICE_CHECK");
+    hadoop_clients.getServiceComponent("SOME_CLIENT_FOR_SERVICE_CHECK").addServiceComponentHost(host1);
+    hadoop_clients.getServiceComponent("SOME_CLIENT_FOR_SERVICE_CHECK").addServiceComponentHost(host2);
+
     resourceFilters.clear();
     resourceFilter = new RequestResourceFilter("CORE", "HDFS", null,
       Arrays.asList(host1));
@@ -8580,9 +8595,11 @@ public void testScheduleSmokeTest() throws Exception {
     serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "HDFS", "NAMENODE", null));
     serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "HDFS", "SECONDARY_NAMENODE", null));
     serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "HDFS", "DATANODE", null));
+    serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "HDFS", "HDFS_CLIENT", null));
     serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "MAPREDUCE2", "HISTORYSERVER", null));
     serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "YARN", "RESOURCEMANAGER", null));
     serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "YARN", "NODEMANAGER", null));
+    serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "YARN", "YARN_CLIENT", null));
 
     ComponentResourceProviderTest.createComponents(amc, serviceComponentRequests);
 
@@ -8594,10 +8611,12 @@ public void testScheduleSmokeTest() throws Exception {
     Set<ServiceComponentHostRequest> componentHostRequests = new HashSet<>();
     componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "DATANODE", HOST1, null));
     componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "NAMENODE", HOST1, null));
+    componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "HDFS_CLIENT", HOST1, null));
     componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "SECONDARY_NAMENODE", HOST1, null));
     componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "HISTORYSERVER", HOST1, null));
     componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "RESOURCEMANAGER", HOST1, null));
     componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "NODEMANAGER", HOST1, null));
+    componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "YARN_CLIENT", HOST1, null));
 
     amc.createHostComponents(componentHostRequests);
 
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
index 5573d290b84..cef96662fc1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
@@ -243,7 +243,7 @@ public void testGetStack() {
     assertEquals("1.0", pigService.getVersion());
     assertEquals("This is comment for PIG service", pigService.getComment());
     components = pigService.getComponents();
-    assertEquals(1, components.size());
+    assertEquals(2, components.size());
     CommandScriptDefinition commandScript = pigService.getCommandScript();
     assertEquals("scripts/service_check.py", commandScript.getScript());
     assertEquals(CommandScriptDefinition.Type.PYTHON, commandScript.getScriptType());
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
index a63b6e74677..a43835d8c70 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
@@ -34,6 +34,16 @@
             <timeout>600</timeout>
           </commandScript>
         </component>
+        <component>
+          <name>SOME_CLIENT_FOR_SERVICE_CHECK</name>
+          <category>CLIENT</category>
+          <cardinality>0+</cardinality>
+          <commandScript>
+            <script>scripts/pig_client.py</script>
+            <scriptType>PYTHON</scriptType>
+            <timeout>600</timeout>
+          </commandScript>
+        </component>
       </components>
       <osSpecifics>
         <osSpecific>