diff --git a/src/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm b/src/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm
index ad978c93d4..beb92f53de 100644
--- a/src/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm
+++ b/src/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm
@@ -106,7 +106,7 @@ sub manage_selection {
         next if (!defined($oids->{$base}));
         next if ($results->{$oid} !~ /\d/);
         next if (defined($self->{option_results}->{exclude_id}) && $self->{option_results}->{exclude_id} ne '' &&
-                $self->{option_results}->{exclude_id} =~ /$instance(,|\h)/);
+                $self->{option_results}->{exclude_id} =~ /$instance(,|\h|$)/);
 
         $self->{line}->{$instance} = { display => $instance } if (!defined($self->{line}->{$instance}));
         $self->{line}->{$instance}->{$oids->{$base}->{name}} = $results->{$oid} * $oids->{$base}->{factor};
diff --git a/tests/functional/snmp/hardware-ups-socomec.robot b/tests/functional/snmp/hardware-ups-socomec.robot
deleted file mode 100644
index f3fc725a44..0000000000
--- a/tests/functional/snmp/hardware-ups-socomec.robot
+++ /dev/null
@@ -1,3 +0,0 @@
-perl centreon_plugins.pl --plugin=hardware::ups::socomec::netvision::snmp::plugin --mode=input-lines --hostname=localhost --snmp-port=2024 --snmp-community=local/hardware-ups-standard_github
-
-
diff --git a/tests/functional/snmp/hardware-ups-standard-snmp.robot b/tests/functional/snmp/hardware-ups-standard-snmp.robot
index fd16f41697..3cf91a179c 100644
--- a/tests/functional/snmp/hardware-ups-standard-snmp.robot
+++ b/tests/functional/snmp/hardware-ups-standard-snmp.robot
@@ -12,23 +12,34 @@ ${CENTREON_PLUGINS}         ${CURDIR}${/}..${/}..${/}..${/}src${/}centreon_plugi
 
 ${CMD}                      perl ${CENTREON_PLUGINS} --plugin=hardware::ups::standard::rfc1628::snmp::plugin
 
-&{ups_standard_test1}
-...                         snmpcommunity=hardware-ups-standard/hardware-ups-standard
-...                         result=OK: All input lines are ok | '1#line.input.frequence.hertz'=49.9Hz;;;; '1#line.input.voltage.volt'=233V;;;; '1#line.input.current.ampere'=0A;;;; '1#line.input.power.watt'=0W;;;; '2#line.input.frequence.hertz'=49.9Hz;;;; '2#line.input.voltage.volt'=234V;;;; '2#line.input.current.ampere'=0A;;;; '2#line.input.power.watt'=0W;;;; '3#line.input.frequence.hertz'=49.9Hz;;;; '3#line.input.voltage.volt'=234V;;;; '3#line.input.current.ampere'=0A;;;; '3#line.input.power.watt'=0W;;;;
+&{ups_standard_test_with_values}
+...                         snmpcommunity=hardware-ups/hardware-ups-standard
 ...                         warningpower=
 ...                         criticalcurrent=
 ...                         warningvoltage=
 ...                         warningfrequence=
-&{ups_standard_test2}
-...                         snmpcommunity=hardware-ups-standard/hardware-ups-standard_null_val
+...                         excludeid=
+...                         result=OK: All input lines are ok | '1#line.input.frequence.hertz'=49.9Hz;;;; '1#line.input.voltage.volt'=233V;;;; '1#line.input.current.ampere'=0A;;;; '1#line.input.power.watt'=0W;;;; '2#line.input.frequence.hertz'=49.9Hz;;;; '2#line.input.voltage.volt'=234V;;;; '2#line.input.current.ampere'=0A;;;; '2#line.input.power.watt'=0W;;;; '3#line.input.frequence.hertz'=49.9Hz;;;; '3#line.input.voltage.volt'=234V;;;; '3#line.input.current.ampere'=0A;;;; '3#line.input.power.watt'=0W;;;;
+&{ups_standard_test_critical_with_null_values}
+...                         snmpcommunity=hardware-ups/hardware-ups-standard_null_val
 ...                         warningpower='215:'
 ...                         criticalcurrent='@0:214'
 ...                         warningvoltage='@0:214'
 ...                         warningfrequence='@0:214'
+...                         excludeid=
 ...                         result=CRITICAL: Input Line '1' Frequence : 0.00 Hz, Voltage : 0.00 V, Current : 0.00 A, Power : 0.00 W - Input Line '2' Frequence : 0.00 Hz, Voltage : 0.00 V, Current : 0.00 A, Power : 0.00 W - Input Line '3' Frequence : 0.00 Hz, Voltage : 0.00 V, Current : 0.00 A, Power : 0.00 W | '1#line.input.frequence.hertz'=0Hz;@0:214;;; '1#line.input.voltage.volt'=0V;@0:214;;; '1#line.input.current.ampere'=0A;;@0:214;; '1#line.input.power.watt'=0W;215:;;; '2#line.input.frequence.hertz'=0Hz;@0:214;;; '2#line.input.voltage.volt'=0V;@0:214;;; '2#line.input.current.ampere'=0A;;@0:214;; '2#line.input.power.watt'=0W;215:;;; '3#line.input.frequence.hertz'=0Hz;@0:214;;; '3#line.input.voltage.volt'=0V;@0:214;;; '3#line.input.current.ampere'=0A;;@0:214;; '3#line.input.power.watt'=0W;215:;;;
+&{ups_standard_test_with_exclude_option}
+...                         snmpcommunity=hardware-ups/hardware-ups-standard
+...                         warningpower=
+...                         criticalcurrent=
+...                         warningvoltage=
+...                         warningfrequence=
+...                         excludeid='1,2'
+...                         result=OK: Input Line '3' Frequence : 49.90 Hz, Voltage : 234.00 V, Current : 0.00 A, Power : 0.00 W | '3#line.input.frequence.hertz'=49.9Hz;;;; '3#line.input.voltage.volt'=234V;;;; '3#line.input.current.ampere'=0A;;;; '3#line.input.power.watt'=0W;;;;
 @{ups_standard_tests}
-...                         &{ups_standard_test1}
-...                         &{ups_standard_test2}
+...                         &{ups_standard_test_with_values}
+...                         &{ups_standard_test_critical_with_null_values}
+...                         &{ups_standard_test_with_exclude_option}
 
 
 *** Test Cases ***
@@ -59,6 +70,10 @@ Hardware UPS Standard SNMP input lines
         IF    ${length} > 0
             ${command}    Catenate    ${command}    --warning-frequence=${ups_standard_test.warningfrequence}
         END
+        ${length}    Get Length    ${ups_standard_test.excludeid}
+        IF    ${length} > 0
+            ${command}    Catenate    ${command}    --exclude-id=${ups_standard_test.excludeid}
+        END
         Log To Console    ${command}
         ${output}    Run    ${command}
         ${output}    Strip String    ${output}
diff --git a/tests/resources/snmp/hardware-ups-standard/hardware-ups-standard_github.snmpwalk b/tests/resources/snmp/hardware-ups/hardware-ups-socomec.snmpwalk
similarity index 100%
rename from tests/resources/snmp/hardware-ups-standard/hardware-ups-standard_github.snmpwalk
rename to tests/resources/snmp/hardware-ups/hardware-ups-socomec.snmpwalk
diff --git a/tests/resources/snmp/hardware-ups-standard/hardware-ups-standard_github_null_val.snmpwalk b/tests/resources/snmp/hardware-ups/hardware-ups-socomec_null_val.snmpwalk
similarity index 100%
rename from tests/resources/snmp/hardware-ups-standard/hardware-ups-standard_github_null_val.snmpwalk
rename to tests/resources/snmp/hardware-ups/hardware-ups-socomec_null_val.snmpwalk
diff --git a/tests/resources/snmp/hardware-ups-standard/hardware-ups-standard.snmpwalk b/tests/resources/snmp/hardware-ups/hardware-ups-standard.snmpwalk
similarity index 100%
rename from tests/resources/snmp/hardware-ups-standard/hardware-ups-standard.snmpwalk
rename to tests/resources/snmp/hardware-ups/hardware-ups-standard.snmpwalk
diff --git a/tests/resources/snmp/hardware-ups-standard/hardware-ups-standard_null_val.snmpwalk b/tests/resources/snmp/hardware-ups/hardware-ups-standard_null_val.snmpwalk
similarity index 100%
rename from tests/resources/snmp/hardware-ups-standard/hardware-ups-standard_null_val.snmpwalk
rename to tests/resources/snmp/hardware-ups/hardware-ups-standard_null_val.snmpwalk