diff --git a/test/cmp_icu/test_cmp_icu.c b/test/cmp_icu/test_cmp_icu.c
index b78cb52e7c8867d482abfe8d3717f2e0f3664152..a51de9cf1b43111f815c7c14261a63906ae19bdf 100644
--- a/test/cmp_icu/test_cmp_icu.c
+++ b/test/cmp_icu/test_cmp_icu.c
@@ -2388,7 +2388,7 @@ void test_compress_imagette_stuff(void)
 void test_compress_imagette_raw(void)
 {
 	uint16_t data[] = {0x0, 0x1, 0x23, 0x42, (uint16_t)INT16_MIN, INT16_MAX, UINT16_MAX};
-	uint32_t *output_buf = malloc(7*sizeof(uint16_t));
+	void *output_buf = malloc(7*sizeof(uint16_t));
 	uint16_t cmp_data[7];
 	struct cmp_cfg cfg = {0};
 	int cmp_size;
diff --git a/test/cmp_icu/test_decmp.c b/test/cmp_icu/test_decmp.c
index f2a7a59f72bb6357ad96e5243634fded6f56b09c..a773ff169017c14d78650603c99774f0abe8246c 100644
--- a/test/cmp_icu/test_decmp.c
+++ b/test/cmp_icu/test_decmp.c
@@ -1022,14 +1022,23 @@ void test_cmp_decmp_s_fx_diff(void)
 
 	struct cmp_entity *ent;
 	const uint32_t MAX_VALUE = ~(~0U << MAX_USED_BITS_V1.s_fx);
-	struct s_fx data_entry[DATA_SAMPLES] = {
-		{0, 0}, {1, 23}, {2, 42}, {3, MAX_VALUE}, {3, MAX_VALUE>>1} };
+	struct s_fx data_entry[DATA_SAMPLES];
 	uint8_t data_to_compress[MULTI_ENTRY_HDR_SIZE + sizeof(data_entry)];
 	struct s_fx *decompressed_data = NULL;
-	/* uint32_t *compressed_data = NULL; */
 	uint32_t compressed_data_len_samples = DATA_SAMPLES;
 	struct cmp_cfg cfg;
 
+	data_entry[0].exp_flags = 0;
+	data_entry[0].fx = 0;
+	data_entry[1].exp_flags = 1;
+	data_entry[1].fx = 23;
+	data_entry[2].exp_flags = 2;
+	data_entry[2].fx = 42;
+	data_entry[3].exp_flags = 3;
+	data_entry[3].fx = MAX_VALUE;
+	data_entry[4].exp_flags = 3;
+	data_entry[4].fx = MAX_VALUE>>1;
+
 	for (s = 0; s < MULTI_ENTRY_HDR_SIZE; s++)
 		data_to_compress[s] = (uint8_t)s;
 	memcpy(&data_to_compress[MULTI_ENTRY_HDR_SIZE], data_entry, sizeof(data_entry));
@@ -1197,7 +1206,7 @@ void test_cmp_ent_write_cmp_pars(void)
 	int error;
 	struct cmp_entity *ent;
 	struct cmp_cfg cfg = {0}, cfg_read = {0};
-	int cmp_size_bits = 93; /* 12 bytes */
+	int cmp_size_bits;
 	uint32_t size;
 	struct cmp_max_used_bits max_used_bits = MAX_USED_BITS_SAFE;
 
@@ -1205,6 +1214,7 @@ void test_cmp_ent_write_cmp_pars(void)
 	max_used_bits.version = 42;
 	cmp_max_used_bits_list_add(&max_used_bits);
 
+	cmp_size_bits = 93;
 	/** RAW mode test **/
 	/* create imagette raw mode configuration */
 	cfg.data_type = DATA_TYPE_IMAGETTE;