diff --git a/components/libsodium/component.mk b/components/libsodium/component.mk
index 610c83cd2b..68e91cc5a8 100644
--- a/components/libsodium/component.mk
+++ b/components/libsodium/component.mk
@@ -16,7 +16,8 @@ COMPONENT_SRCDIRS += \
 	$(LSRC)/crypto_auth/hmacsha512256 \
 	$(LSRC)/crypto_box \
 	$(LSRC)/crypto_box/curve25519xsalsa20poly1305 \
-	$(LSRC)/crypto_core/curve25519/ref10 \
+	$(LSRC)/crypto_core/ed25519 \
+	$(LSRC)/crypto_core/ed25519/ref10 \
 	$(LSRC)/crypto_core/hchacha20 \
 	$(LSRC)/crypto_core/hsalsa20/ref2 \
 	$(LSRC)/crypto_core/hsalsa20 \
@@ -40,6 +41,9 @@ COMPONENT_SRCDIRS += \
 	$(LSRC)/crypto_scalarmult \
 	$(LSRC)/crypto_scalarmult/curve25519 \
 	$(LSRC)/crypto_scalarmult/curve25519/ref10 \
+	$(LSRC)/crypto_scalarmult/curve25519/sandy2x \
+	$(LSRC)/crypto_scalarmult/ed25519/ref10 \
+	$(LSRC)/crypto_scalarmult/ristretto255/ref10 \
 	$(LSRC)/crypto_secretbox \
 	$(LSRC)/crypto_secretbox/xsalsa20poly1305 \
 	$(LSRC)/crypto_shorthash \
diff --git a/tools/unit-test-app/components/test_utils/component.mk b/tools/unit-test-app/components/test_utils/component.mk
index 95f27ab39c..7dadbd17bc 100644
--- a/tools/unit-test-app/components/test_utils/component.mk
+++ b/tools/unit-test-app/components/test_utils/component.mk
@@ -1,3 +1,18 @@
 COMPONENT_PRIV_INCLUDEDIRS := private_include
 COMPONENT_ADD_INCLUDEDIRS : include
-COMPONENT_SRCDIRS := . esp32
+COMPONENT_SRCDIRS := .
+COMPONENT_OBJS := ccomp_timer.o test_runner.o test_utils.o
+
+ifdef CONFIG_IDF_TARGET_ESP32
+COMPONENT_OBJS += ref_clock_impl_rmt_pcnt.o
+else
+COMPONENT_OBJS += ref_clock_impl_timergroup.o
+endif
+
+ifdef CONFIG_IDF_TARGET_ARCH_RISCV
+COMPONENT_OBJS += ccomp_timer_impl_riscv.o
+endif
+
+ifdef CONFIG_IDF_TARGET_ARCH_XTENSA
+COMPONENT_OBJS += ccomp_timer_impl_xtensa.o
+endif