diff --git a/test/cmocka/src/math/numbers/find_max_abs_int32.c b/test/cmocka/src/math/numbers/find_max_abs_int32.c
index 7e65493aa..aa669887d 100644
--- a/test/cmocka/src/math/numbers/find_max_abs_int32.c
+++ b/test/cmocka/src/math/numbers/find_max_abs_int32.c
@@ -5,6 +5,7 @@
 // Author: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
 
 #include <sof/math/numbers.h>
+#include <sof/common.h>
 
 #include <stdarg.h>
 #include <stddef.h>
@@ -18,7 +19,7 @@ static void test_math_numbers_find_max_abs_int32_for_neg100_99_98_50_equals_100
 	(void)state;
 
 	int32_t vec[] = {-100, 99, 98, 50};
-	int r = find_max_abs_int32(vec, sizeof(vec) / sizeof(int32_t));
+	int r = find_max_abs_int32(vec, ARRAY_SIZE(vec));
 
 	assert_int_equal(r, 100);
 }
@@ -29,7 +30,7 @@ static void test_math_numbers_find_max_abs_int32_for_neg100_99_98_50_101_equals_
 	(void)state;
 
 	int32_t vec[] = {-100, 99, 98, 50, 101};
-	int r = find_max_abs_int32(vec, sizeof(vec) / sizeof(int32_t));
+	int r = find_max_abs_int32(vec, ARRAY_SIZE(vec));
 
 	assert_int_equal(r, 101);
 }
diff --git a/test/cmocka/src/math/numbers/find_min_int16.c b/test/cmocka/src/math/numbers/find_min_int16.c
index 2e08b729e..919898fe5 100644
--- a/test/cmocka/src/math/numbers/find_min_int16.c
+++ b/test/cmocka/src/math/numbers/find_min_int16.c
@@ -5,6 +5,7 @@
 // Author: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
 
 #include <sof/math/numbers.h>
+#include <sof/common.h>
 
 #include <stdarg.h>
 #include <stddef.h>
@@ -17,7 +18,7 @@ static void test_math_numbers_find_min_int16_for_2_equals_2(void **state)
 	(void)state;
 
 	int16_t vec[] = {2};
-	int r = find_min_int16(vec, sizeof(vec) / sizeof(int16_t));
+	int r = find_min_int16(vec, ARRAY_SIZE(vec));
 
 	assert_int_equal(r, 2);
 }
@@ -28,7 +29,7 @@ static void test_math_numbers_find_min_int16_for_5_2_3_4_1_equals_1
 	(void)state;
 
 	int16_t vec[] = {5, 2, 3, 4, 1};
-	int r = find_min_int16(vec, sizeof(vec) / sizeof(int16_t));
+	int r = find_min_int16(vec, ARRAY_SIZE(vec));
 
 	assert_int_equal(r, 1);
 }