diff --git a/shared/oval/installed_OS_is_rhel6.xml b/shared/oval/installed_OS_is_rhel6.xml
index 1ab241b3a94..11b68fe77a7 100644
--- a/shared/oval/installed_OS_is_rhel6.xml
+++ b/shared/oval/installed_OS_is_rhel6.xml
@@ -15,6 +15,7 @@
       <extend_definition comment="Installed OS is part of the Unix family"
       definition_ref="installed_OS_is_part_of_Unix_family" />
       <criteria operator="OR">
+        <criterion comment="RHEL 6 Client is installed" test_ref="test_rhel_client" />
         <criterion comment="RHEL 6 Workstation is installed" test_ref="test_rhel_workstation" />
         <criterion comment="RHEL 6 Server is installed" test_ref="test_rhel_server" />
         <criterion comment="RHEL 6 Compute Node is installed" test_ref="test_rhel_computenode" />
@@ -22,6 +23,17 @@
     </criteria>
   </definition>
 
+  <linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-client is version 6" id="test_rhel_client" version="1">
+    <linux:object object_ref="obj_rhel_client" />
+    <linux:state state_ref="state_rhel_client" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_state id="state_rhel_client" version="1">
+    <linux:version operation="pattern match">^6.*$</linux:version>
+  </linux:rpminfo_state>
+  <linux:rpminfo_object id="obj_rhel_client" version="1">
+    <linux:name>redhat-release-client</linux:name>
+  </linux:rpminfo_object>
+
   <linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-workstation is version 6" id="test_rhel_workstation" version="1">
     <linux:object object_ref="obj_rhel_workstation" />
     <linux:state state_ref="state_rhel_workstation" />
diff --git a/shared/oval/installed_OS_is_rhel7.xml b/shared/oval/installed_OS_is_rhel7.xml
index 6a341041ca9..ff615f8e866 100644
--- a/shared/oval/installed_OS_is_rhel7.xml
+++ b/shared/oval/installed_OS_is_rhel7.xml
@@ -15,6 +15,7 @@
       <criterion comment="Installed operating system is part of the unix family"
       test_ref="test_rhel7_unix_family" />
       <criteria operator="OR">
+        <criterion comment="RHEL 7 Client is installed" test_ref="test_rhel7_client" />
         <criterion comment="RHEL 7 Workstation is installed" test_ref="test_rhel7_workstation" />
         <criterion comment="RHEL 7 Server is installed" test_ref="test_rhel7_server" />
         <criterion comment="RHEL 7 Compute Node is installed" test_ref="test_rhel7_computenode" />
@@ -31,6 +32,17 @@
   </ind:family_state>
   <ind:family_object id="obj_rhel7_unix_family" version="1" />
 
+  <linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-client is version 7" id="test_rhel7_client" version="1">
+    <linux:object object_ref="obj_rhel7_client" />
+    <linux:state state_ref="state_rhel7_client" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_state id="state_rhel7_client" version="1">
+    <linux:version operation="pattern match">^7.*$</linux:version>
+  </linux:rpminfo_state>
+  <linux:rpminfo_object id="obj_rhel7_client" version="1">
+    <linux:name>redhat-release-client</linux:name>
+  </linux:rpminfo_object>
+
   <linux:rpminfo_test check="all" check_existence="at_least_one_exists" comment="redhat-release-workstation is version 7" id="test_rhel7_workstation" version="1">
     <linux:object object_ref="obj_rhel7_workstation" />
     <linux:state state_ref="state_rhel7_workstation" />