diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 6bf9af3..6fa0d3b 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1657,14 +1657,13 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 	Opcode 0x16 - Test Command command/response
 
 		Command parameters: Command (4 octets)
-		                    Test Parameters (32 octets)
-		Valid Test Parameter: Address (6 octets)
-		                      UUID (16 octets)
-		                      U1 (2 octets)
-		                      U2 (2 octets)
-		                      U3 (2 octets)
-		                      U4 (2 octets)
-		                      U5 (2 octets)
+		                    Address (6 octets)
+		                    UUID (16 octets)
+		                    U1 (2 octets)
+		                    U2 (2 octets)
+		                    U3 (2 octets)
+		                    U4 (2 octets)
+		                    U5 (2 octets)
 		Response parameters: <none>
 
 		In case of an error, the error response will be returned.
diff --git a/android/hal-msg.h b/android/hal-msg.h
index e26ff7d..90d6854 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -680,7 +680,8 @@ struct hal_cmd_gatt_client_set_adv_data {
 } __attribute__((packed));
 
 #define HAL_OP_GATT_CLIENT_TEST_COMMAND		0x16
-struct hal_gatt_test_params {
+struct hal_cmd_gatt_client_test_command {
+	int32_t command;
 	uint8_t  bda1[6];
 	uint8_t  uuid1[16];
 	uint16_t u1;
@@ -690,11 +691,6 @@ struct hal_gatt_test_params {
 	uint16_t u5;
 } __attribute__((packed));
 
-struct hal_cmd_gatt_client_test_command {
-	int32_t command;
-	struct hal_gatt_test_params params;
-} __attribute__((packed));
-
 #define HAL_OP_GATT_SERVER_REGISTER		0x17
 struct hal_cmd_gatt_server_register {
 	uint8_t uuid[16];