diff --git a/skip_list b/skip_list
index aedd681..f7ec447 100644
--- a/skip_list
+++ b/skip_list
@@ -15,3 +15,7 @@
 -e Set_valid_Mac_address
 #https://github.com/openbmc/openbmc-test-automation/issues/107
 -e Revert_old_Mac_address
+#https://github.com/openbmc/openbmc-test-automation/issues/22
+-e Validate_Heartbeat_LEDs_Test_Cases
+-e Validate_Identify_LEDs_Test_Cases
+-e Validate_Beep_LEDs_Test_Cases
diff --git a/tests/test_led.robot b/tests/test_led.robot
index bc7cc6a..86798db 100644
--- a/tests/test_led.robot
+++ b/tests/test_led.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 
-Documentation     This testsuite is for testing the functions of Heartbeat, 
+Documentation     This testsuite is for testing the functions of Heartbeat,
 ...               Identify and Power LED's
 
 Resource          ../lib/rest_client.robot
@@ -17,16 +17,19 @@
 
 Validate Heartbeat LEDs Test Cases
     [Documentation]   If heartbeat LED exist then execute the test set.
+    [Tags]  Validate_Heartbeat_LEDs_Test_Cases
     ${resp} =   OpenBMC Get Request   /org/openbmc/control/led/heartbeat
     Run keyword If  ${resp.status_code} == ${HTTP_OK}   Execute Heartbeat LEDs Test Cases
 
 Validate Identify LEDs Test Cases
     [Documentation]   If identify LED exist then execute the test set.
+    [Tags]  Validate_Identify_LEDs_Test_Cases
     ${resp} =   OpenBMC Get Request   /org/openbmc/control/led/identify
     Run keyword If  ${resp.status_code} == ${HTTP_OK}   Execute Identify LEDs Test Cases
 
 Validate Beep LEDs Test Cases
     [Documentation]   If beep LED exist then execute the test set.
+    [Tags]  Validate_Beep_LEDs_Test_Cases
     ${resp} =   OpenBMC Get Request   /org/openbmc/control/led/beep
     Run keyword If  ${resp.status_code} == ${HTTP_OK}  Execute Beep LEDs Test Cases
 
@@ -191,7 +194,7 @@
    \   ${ON_VALUE} =   Set Variable If   '${ledstate}'=='On'   ${ON_VALUE + 1}   ${ON_VALUE}
    \   ${OFF_VALUE} =   Set Variable If   '${ledstate}'=='Off'   ${OFF_VALUE + 1}   ${OFF_VALUE}
    should be true   ${ON_VALUE} > ${MIN_TOGGLE_VALUE} and ${OFF_VALUE} > ${MIN_TOGGLE_VALUE}
-   
+
 Get LED State
    [arguments]    ${args}
    ${data} =   create dictionary   data=@{EMPTY}
@@ -199,7 +202,7 @@
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
    ${json} =   to json   ${resp.content}
    [return]    ${json['data'][1]}
-   
+
 Set On
    [arguments]    ${args}
    ${data} =   create dictionary   data=@{EMPTY}
@@ -207,7 +210,7 @@
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
    ${json} =   to json   ${resp.content}
    should be equal as integers   ${json['data']}   0
-   
+
 Set Off
    [arguments]    ${args}
    ${data} =   create dictionary   data=@{EMPTY}
@@ -215,7 +218,7 @@
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
    ${json} =   to json   ${resp.content}
    should be equal as integers   ${json['data']}   0
-   
+
 Set Blink Fast
    [arguments]    ${args}
    ${data} =   create dictionary   data=@{EMPTY}
@@ -223,7 +226,7 @@
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
    ${json} =   to json   ${resp.content}
    should be equal as integers   ${json['data']}   0
-   
+
 Set Blink Slow
    [arguments]    ${args}
    ${data} =   create dictionary   data=@{EMPTY}