diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index 26d2dd4..e625210 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -852,6 +852,14 @@ static const char add_uuid32_param_2[] = {
 			0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80,
 			0x00, 0x10, 0x00, 0x00, 0xef, 0xcd, 0xbc, 0x9a,
 			0x00 };
+static const char add_uuid32_param_3[] = {
+			0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80,
+			0x00, 0x10, 0x00, 0x00, 0xff, 0xee, 0xdd, 0xcc,
+			0x00 };
+static const char add_uuid32_param_4[] = {
+			0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80,
+			0x00, 0x10, 0x00, 0x00, 0x11, 0x22, 0x33, 0x44,
+			0x00 };
 static const char write_eir_uuid32_hci[] = { 0x00,
 			0x02, 0x0a, 0x00, 0x05, 0x05, 0x78, 0x56, 0x34,
 			0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -884,9 +892,9 @@ static const char write_eir_uuid32_hci[] = { 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 static const char write_eir_uuid32_multi_hci[] = { 0x00,
-			0x02, 0x0a, 0x00, 0x09, 0x05, 0x78, 0x56, 0x34,
-			0x12, 0xef, 0xcd, 0xbc, 0x9a, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x02, 0x0a, 0x00, 0x11, 0x05, 0x78, 0x56, 0x34,
+			0x12, 0xef, 0xcd, 0xbc, 0x9a, 0xff, 0xee, 0xdd,
+			0xcc, 0x11, 0x22, 0x33, 0x44, 0x00, 0x00, 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -953,8 +961,8 @@ static const struct generic_data add_uuid32_test_1 = {
 
 static const struct generic_data add_uuid32_multi_test_1 = {
 	.send_opcode = MGMT_OP_ADD_UUID,
-	.send_param = add_uuid32_param_2,
-	.send_len = sizeof(add_uuid32_param_2),
+	.send_param = add_uuid32_param_4,
+	.send_len = sizeof(add_uuid32_param_4),
 	.expect_status = MGMT_STATUS_SUCCESS,
 	.expect_param = set_dev_class_zero_rsp,
 	.expect_len = sizeof(set_dev_class_zero_rsp),
@@ -1301,6 +1309,12 @@ static void setup_multi_uuid32(const void *test_data)
 	mgmt_send(data->mgmt, MGMT_OP_ADD_UUID, data->mgmt_index,
 				sizeof(add_uuid32_param_1), add_uuid32_param_1,
 				NULL, NULL, NULL);
+	mgmt_send(data->mgmt, MGMT_OP_ADD_UUID, data->mgmt_index,
+				sizeof(add_uuid32_param_2), add_uuid32_param_2,
+				NULL, NULL, NULL);
+	mgmt_send(data->mgmt, MGMT_OP_ADD_UUID, data->mgmt_index,
+				sizeof(add_uuid32_param_3), add_uuid32_param_3,
+				NULL, NULL, NULL);
 
 	mgmt_send(data->mgmt, MGMT_OP_SET_POWERED, data->mgmt_index,
 					sizeof(param), param,