diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c
index a2b3195..d89954b 100644
--- a/unit/test-avrcp.c
+++ b/unit/test-avrcp.c
@@ -354,10 +354,12 @@ static int get_value_text(struct avrcp *session, uint8_t transaction,
 static int get_value(struct avrcp *session, uint8_t transaction,
 			uint8_t number, uint8_t *attrs, void *user_data)
 {
-	uint8_t values[2] = { 0x00, 0x00 };
+	uint8_t values[number];
 
 	DBG("");
 
+	memset(values, 0, number);
+
 	avrcp_get_current_player_value_rsp(session, transaction, number, attrs,
 									values);