diff --git a/Makefile.am b/Makefile.am
index bcfeb20bbd7009ea1ea5e8772646046c2307961f..e20f7b412ffb9784358e86a5f218fc5ef4d48942 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,12 +106,22 @@ celt_tests_test_unit_laplace_LDADD = $(LIBM)
 
 celt_tests_test_unit_mathops_SOURCES = celt/tests/test_unit_mathops.c
 celt_tests_test_unit_mathops_LDADD = $(LIBM)
+if CPU_ARM
+if OPUS_ARM_EXTERNAL_ASM
+celt_tests_test_unit_mathops_LDADD += libopus.la
+endif
+endif
 
 celt_tests_test_unit_mdct_SOURCES = celt/tests/test_unit_mdct.c
 celt_tests_test_unit_mdct_LDADD = $(LIBM)
 
 celt_tests_test_unit_rotation_SOURCES = celt/tests/test_unit_rotation.c
 celt_tests_test_unit_rotation_LDADD = $(LIBM)
+if CPU_ARM
+if OPUS_ARM_EXTERNAL_ASM
+celt_tests_test_unit_rotation_LDADD += libopus.la
+endif
+endif
 
 celt_tests_test_unit_types_SOURCES = celt/tests/test_unit_types.c
 celt_tests_test_unit_types_LDADD = $(LIBM)
diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c
index 5296f3240128455e11cfd61d72fbda050500e694..3076bbfb422d38e0c78d82d5223a49c74f87a43f 100644
--- a/celt/tests/test_unit_mathops.c
+++ b/celt/tests/test_unit_mathops.c
@@ -56,6 +56,8 @@
 #include "x86/celt_lpc_sse.c"
 #endif
 #include "x86/x86_celt_map.c"
+#elif defined(OPUS_ARM_ASM) && defined(FIXED_POINT)
+#include "arm/arm_celt_map.c"
 #endif
 
 #ifdef FIXED_POINT
diff --git a/celt/tests/test_unit_rotation.c b/celt/tests/test_unit_rotation.c
index 4dce1af7ef8abec898af1d956b17a910325d7ec1..37ba74e730e95f389d378919a79808cd6764d678 100644
--- a/celt/tests/test_unit_rotation.c
+++ b/celt/tests/test_unit_rotation.c
@@ -54,6 +54,8 @@
 #include "x86/celt_lpc_sse.c"
 #endif
 #include "x86/x86_celt_map.c"
+#elif defined(OPUS_ARM_ASM) && defined(FIXED_POINT)
+#include "arm/arm_celt_map.c"
 #endif
 
 #define MAX_SIZE 100