diff --git a/test/bench_components_mldsa.c b/test/bench/bench_components_mldsa.c
similarity index 97%
rename from test/bench_components_mldsa.c
rename to test/bench/bench_components_mldsa.c
index fea6f44e2..b6261f156 100644
--- a/test/bench_components_mldsa.c
+++ b/test/bench/bench_components_mldsa.c
@@ -8,9 +8,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../mldsa/src/poly.h"
-#include "../mldsa/src/polyvec.h"
-#include "../mldsa/src/randombytes.h"
+#include "../../mldsa/src/poly.h"
+#include "../../mldsa/src/polyvec.h"
+#include "../../mldsa/src/randombytes.h"
 #include "hal.h"
 
 #define NWARMUP 50
diff --git a/test/bench_mldsa.c b/test/bench/bench_mldsa.c
similarity index 98%
rename from test/bench_mldsa.c
rename to test/bench/bench_mldsa.c
index 835e5b1e5..edac635bd 100644
--- a/test/bench_mldsa.c
+++ b/test/bench/bench_mldsa.c
@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../mldsa/src/randombytes.h"
-#include "../mldsa/src/sign.h"
+#include "../../mldsa/src/randombytes.h"
+#include "../../mldsa/src/sign.h"
 #include "hal.h"
 
 #define NWARMUP 3
diff --git a/test/mk/components.mk b/test/mk/components.mk
index 7491eae07..35d26f725 100644
--- a/test/mk/components.mk
+++ b/test/mk/components.mk
@@ -124,7 +124,7 @@ $(MLDSA87_DIR)/bin/%: CFLAGS += -DMLD_CONFIG_PARAMETER_SET=87
 # Link tests with respective library (except test_unit which includes sources directly)
 define ADD_SOURCE
 $(BUILD_DIR)/$(1)/bin/$(2)$(subst mldsa,,$(1)): LDLIBS += -L$(BUILD_DIR) -l$(1)
-$(BUILD_DIR)/$(1)/bin/$(2)$(subst mldsa,,$(1)): $(BUILD_DIR)/$(1)/test/$(3)$(2).c.o $(BUILD_DIR)/lib$(1).a
+$(BUILD_DIR)/$(1)/bin/$(2)$(subst mldsa,,$(1)): $(BUILD_DIR)/$(1)/test/$(3)/$(2).c.o $(BUILD_DIR)/lib$(1).a
 endef
 
 
@@ -148,13 +148,13 @@ endef
 
 $(foreach scheme,mldsa44 mldsa65 mldsa87, \
 	$(foreach test,$(ACVP_TESTS), \
-		$(eval $(call ADD_SOURCE,$(scheme),$(test),acvp/)) \
+		$(eval $(call ADD_SOURCE,$(scheme),$(test),acvp)) \
 	) \
 	$(foreach test,$(BENCH_TESTS), \
-		$(eval $(call ADD_SOURCE,$(scheme),$(test),)) \
+		$(eval $(call ADD_SOURCE,$(scheme),$(test),bench)) \
 	) \
 	$(foreach test,$(BASIC_TESTS), \
-		$(eval $(call ADD_SOURCE,$(scheme),$(test),src/)) \
+		$(eval $(call ADD_SOURCE,$(scheme),$(test),src)) \
 	) \
 	$(eval $(call ADD_SOURCE_UNIT,$(scheme))) \
 	$(eval $(call ADD_SOURCE_ALLOC,$(scheme))) \