diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index e625210..379f0fb 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -782,6 +782,14 @@ static const char add_dun_uuid_param[] = {
 			0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80,
 			0x00, 0x10, 0x00, 0x00, 0x03, 0x11, 0x00, 0x00,
 			0x00 };
+static const char add_sync_uuid_param[] = {
+			0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80,
+			0x00, 0x10, 0x00, 0x00, 0x04, 0x11, 0x00, 0x00,
+			0x00 };
+static const char add_opp_uuid_param[] = {
+			0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80,
+			0x00, 0x10, 0x00, 0x00, 0x05, 0x11, 0x00, 0x00,
+			0x00 };
 static const char write_eir_uuid16_hci[] = { 0x00,
 			0x02, 0x0a, 0x00, 0x03, 0x03, 0x01, 0x11, 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -814,8 +822,8 @@ static const char write_eir_uuid16_hci[] = { 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 static const char write_eir_multi_uuid16_hci[] = { 0x00,
-			0x02, 0x0a, 0x00, 0x05, 0x03, 0x01, 0x11, 0x03,
-			0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x02, 0x0a, 0x00, 0x09, 0x03, 0x01, 0x11, 0x03,
+			0x11, 0x04, 0x11, 0x05, 0x11, 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,
@@ -937,8 +945,8 @@ static const struct generic_data add_uuid16_test_1 = {
 
 static const struct generic_data add_multi_uuid16_test_1 = {
 	.send_opcode = MGMT_OP_ADD_UUID,
-	.send_param = add_dun_uuid_param,
-	.send_len = sizeof(add_dun_uuid_param),
+	.send_param = add_opp_uuid_param,
+	.send_len = sizeof(add_opp_uuid_param),
 	.expect_status = MGMT_STATUS_SUCCESS,
 	.expect_param = set_dev_class_zero_rsp,
 	.expect_len = sizeof(set_dev_class_zero_rsp),
@@ -1334,6 +1342,12 @@ static void setup_multi_uuid16(const void *test_data)
 	mgmt_send(data->mgmt, MGMT_OP_ADD_UUID, data->mgmt_index,
 				sizeof(add_spp_uuid_param), add_spp_uuid_param,
 				NULL, NULL, NULL);
+	mgmt_send(data->mgmt, MGMT_OP_ADD_UUID, data->mgmt_index,
+				sizeof(add_dun_uuid_param), add_dun_uuid_param,
+				NULL, NULL, NULL);
+	mgmt_send(data->mgmt, MGMT_OP_ADD_UUID, data->mgmt_index,
+			sizeof(add_sync_uuid_param), add_sync_uuid_param,
+			NULL, NULL, NULL);
 
 	mgmt_send(data->mgmt, MGMT_OP_SET_POWERED, data->mgmt_index,
 					sizeof(param), param,