diff --git a/src/cmnds/cmd_eventHandlers.c b/src/cmnds/cmd_eventHandlers.c
index ce82a586f..569aa4e11 100644
--- a/src/cmnds/cmd_eventHandlers.c
+++ b/src/cmnds/cmd_eventHandlers.c
@@ -208,6 +208,9 @@ int EVENT_ParseEventName(const char *s) {
 		return CMD_EVENT_CUSTOM_DOWN;
 	if (!stricmp(s, "OnCustomUP"))
 		return CMD_EVENT_CUSTOM_UP;
+	if (isdigit(*s)) {
+		return atoi(s);
+	}
 	return CMD_EVENT_NONE;
 }
 static bool EVENT_EvaluateCondition(int code, int argument, int next) {
diff --git a/src/selftest/selftest_cmd_generic.c b/src/selftest/selftest_cmd_generic.c
index ef674b6e4..74fc55b14 100644
--- a/src/selftest/selftest_cmd_generic.c
+++ b/src/selftest/selftest_cmd_generic.c
@@ -2,7 +2,106 @@
 
 #include "selftest_local.h"
 
+void Test_Events() {
+	// reset whole device
+	SIM_ClearOBK(0);
+
+	CMD_ExecuteCommand("clearAllHandlers", 0);
+	CMD_ExecuteCommand("addEventHandler 123 5 setChannel 10 555", 0);
+	SELFTEST_ASSERT_CHANNEL(10, 0);
+	EventHandlers_FireEvent(123, 4);
+	SELFTEST_ASSERT_CHANNEL(10, 0);
+	EventHandlers_FireEvent(123, 6);
+	SELFTEST_ASSERT_CHANNEL(10, 0);
+	EventHandlers_FireEvent(123, 5); // matching arguments - event will fire
+	SELFTEST_ASSERT_CHANNEL(10, 555);
+	CMD_ExecuteCommand("clearAllHandlers", 0);
+	CMD_ExecuteCommand("setchannel 10 666", 0);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent(123, 5);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	CMD_ExecuteCommand("addEventHandler2 123 5 6 setChannel 10 444", 0);
+	EventHandlers_FireEvent2(123, 5, 5);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent2(123, 6, 5);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent2(123, 6, 6);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent2(123, 5, 6); // matching arguments - event will fire
+	SELFTEST_ASSERT_CHANNEL(10, 444);
+	CMD_ExecuteCommand("clearAllHandlers", 0);
+	CMD_ExecuteCommand("setchannel 10 666", 0);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent2(123, 6, 6);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent2(123, 5, 6); // no event to fire
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	CMD_ExecuteCommand("addEventHandler3 123 1 2 3 setChannel 10 222", 0);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent3(123, 1, 2, 2);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent3(123, 1, 2, 1);
+	SELFTEST_ASSERT_CHANNEL(10, 666);
+	EventHandlers_FireEvent3(123, 1, 2, 3);
+	SELFTEST_ASSERT_CHANNEL(10, 222);
+
+	// test events parse
+	SELFTEST_ASSERT(EVENT_ParseEventName("channel1") == CMD_EVENT_CHANGE_CHANNEL0 + 1);
+	SELFTEST_ASSERT(EVENT_ParseEventName("channel6") == CMD_EVENT_CHANGE_CHANNEL0 + 6);
+	SELFTEST_ASSERT(EVENT_ParseEventName("channel15") == CMD_EVENT_CHANGE_CHANNEL0 + 15);
+	SELFTEST_ASSERT(EVENT_ParseEventName("noPingTime") == CMD_EVENT_CHANGE_NOPINGTIME);
+	SELFTEST_ASSERT(EVENT_ParseEventName("NoMQTTTime") == CMD_EVENT_CHANGE_NOMQTTTIME);
+	SELFTEST_ASSERT(EVENT_ParseEventName("voltage") == CMD_EVENT_CHANGE_VOLTAGE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("current") == CMD_EVENT_CHANGE_CURRENT);
+	SELFTEST_ASSERT(EVENT_ParseEventName("power") == CMD_EVENT_CHANGE_POWER);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnRelease") == CMD_EVENT_PIN_ONRELEASE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnPress") == CMD_EVENT_PIN_ONPRESS);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnClick") == CMD_EVENT_PIN_ONCLICK);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnToggle") == CMD_EVENT_PIN_ONTOGGLE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IPChange") == CMD_EVENT_IPCHANGE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnHold") == CMD_EVENT_PIN_ONHOLD);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnHoldStart") == CMD_EVENT_PIN_ONHOLDSTART);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnDblClick") == CMD_EVENT_PIN_ONDBLCLICK);
+	SELFTEST_ASSERT(EVENT_ParseEventName("On3Click") == CMD_EVENT_PIN_ON3CLICK);
+	SELFTEST_ASSERT(EVENT_ParseEventName("On4Click") == CMD_EVENT_PIN_ON4CLICK);
+	SELFTEST_ASSERT(EVENT_ParseEventName("On5Click") == CMD_EVENT_PIN_ON5CLICK);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnChannelChange") == CMD_EVENT_CHANNEL_ONCHANGE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnUART") == CMD_EVENT_ON_UART);
+	SELFTEST_ASSERT(EVENT_ParseEventName("MQTTState") == CMD_EVENT_MQTT_STATE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("NTPState") == CMD_EVENT_NTP_STATE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("LEDState") == CMD_EVENT_LED_STATE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("LEDMode") == CMD_EVENT_LED_MODE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("energycounter") == CMD_EVENT_CHANGE_CONSUMPTION_TOTAL);
+	SELFTEST_ASSERT(EVENT_ParseEventName("energy") == CMD_EVENT_CHANGE_CONSUMPTION_TOTAL);
+	SELFTEST_ASSERT(EVENT_ParseEventName("energycounter_last_hour") == CMD_EVENT_CHANGE_CONSUMPTION_LAST_HOUR);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IR_RC5") == CMD_EVENT_IR_RC5);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IR_RC6") == CMD_EVENT_IR_RC6);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IR_Samsung") == CMD_EVENT_IR_SAMSUNG);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IR_PANASONIC") == CMD_EVENT_IR_PANASONIC);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IR_NEC") == CMD_EVENT_IR_NEC);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IR_SAMSUNG_LG") == CMD_EVENT_IR_SAMSUNG_LG);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IR_SHARP") == CMD_EVENT_IR_SHARP);
+	SELFTEST_ASSERT(EVENT_ParseEventName("IR_SONY") == CMD_EVENT_IR_SONY);
+	SELFTEST_ASSERT(EVENT_ParseEventName("WiFiState") == CMD_EVENT_WIFI_STATE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("TuyaMCUParsed") == CMD_EVENT_TUYAMCU_PARSED);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnADCButton") == CMD_EVENT_ADC_BUTTON);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnCustomDown") == CMD_EVENT_CUSTOM_DOWN);
+	SELFTEST_ASSERT(EVENT_ParseEventName("OnCustomUP") == CMD_EVENT_CUSTOM_UP);
+
+	// test for numeric strings
+	SELFTEST_ASSERT(EVENT_ParseEventName("123") == 123);
+	SELFTEST_ASSERT(EVENT_ParseEventName("42") == 42);
+
+	// test for unknown event names
+	SELFTEST_ASSERT(EVENT_ParseEventName("UnknownEvent") == CMD_EVENT_NONE);
+	SELFTEST_ASSERT(EVENT_ParseEventName("") == CMD_EVENT_NONE);
+	SELFTEST_ASSERT(EVENT_ParseEventName(" ") == CMD_EVENT_NONE);
+}
+
+
 void Test_Commands_Generic() {
+	Test_Events();
+
 	// reset whole device
 	SIM_ClearOBK(0);