diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index 67be8a8..11d9029 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -999,6 +999,9 @@ static const char set_local_name_param[260] = { 'T', 'e', 's', 't', ' ',
 						'n', 'a', 'm', 'e' };
 static const char write_local_name_hci[248] = { 'T', 'e', 's', 't', ' ',
 						'n', 'a', 'm', 'e' };
+static const char write_eir_local_name_hci_1[241] = { 0x00,
+		0x0a, 0x09, 'T', 'e', 's', 't', ' ', 'n', 'a', 'm', 'e',
+		0x02, 0x0a, 0x00, };
 
 static const struct generic_data set_local_name_test_1 = {
 	.send_opcode = MGMT_OP_SET_LOCAL_NAME,
@@ -1027,6 +1030,21 @@ static const struct generic_data set_local_name_test_2 = {
 	.expect_alt_ev_len = sizeof(set_local_name_param),
 };
 
+static const struct generic_data set_local_name_test_3 = {
+	.send_opcode = MGMT_OP_SET_LOCAL_NAME,
+	.send_param = set_local_name_param,
+	.send_len = sizeof(set_local_name_param),
+	.expect_status = MGMT_STATUS_SUCCESS,
+	.expect_param = set_local_name_param,
+	.expect_len = sizeof(set_local_name_param),
+	.expect_hci_command = BT_HCI_CMD_WRITE_EXT_INQUIRY_RESPONSE,
+	.expect_hci_param = write_eir_local_name_hci_1,
+	.expect_hci_len = sizeof(write_eir_local_name_hci_1),
+	.expect_alt_ev = MGMT_EV_LOCAL_NAME_CHANGED,
+	.expect_alt_ev_param = set_local_name_param,
+	.expect_alt_ev_len = sizeof(set_local_name_param),
+};
+
 static const char start_discovery_invalid_param[] = { 0x00 };
 static const char start_discovery_bredr_param[] = { 0x01 };
 static const char start_discovery_le_param[] = { 0x06 };
@@ -2432,6 +2450,8 @@ int main(int argc, char *argv[])
 						NULL, test_command_generic);
 	test_bredr("Set Local Name - Success 2", &set_local_name_test_2,
 					setup_powered, test_command_generic);
+	test_bredr("Set Local Name - Success 3", &set_local_name_test_3,
+				setup_ssp_powered, test_command_generic);
 
 	test_bredrle("Start Discovery - Not powered 1",
 				&start_discovery_not_powered_test_1,