diff --git a/tests/Makefile b/tests/Makefile
index 7f10ce4..67d4238 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -38,26 +38,27 @@ OBJECTS_SET    := $(addprefix $(BUILD_PATH)/obj/,$(OBJECTS_TESTS)) $(addprefix .
 ########################################################################################################################
 
 tests: modules
-tests: $(BUILD_PATH)/array
-tests: $(BUILD_PATH)/string
-tests: $(BUILD_PATH)/list
-tests: $(BUILD_PATH)/map
-tests: $(BUILD_PATH)/set
+tests: $(addprefix $(BUILD_PATH)/array-,$(notdir $(basename $(wildcard ./src/array/*.c))))
+tests: $(addprefix $(BUILD_PATH)/string-,$(notdir $(basename $(wildcard ./src/string/*.c))))
+tests: $(addprefix $(BUILD_PATH)/list-,$(notdir $(basename $(wildcard ./src/list/*.c))))
+tests: $(addprefix $(BUILD_PATH)/map-,$(notdir $(basename $(wildcard ./src/map/*.c))))
+tests: $(addprefix $(BUILD_PATH)/set-,$(notdir $(basename $(wildcard ./src/set/*.c))))
+
 
 ########################################################################################################################
 
 $(BUILD_PATH)/obj/%.o: ./src/%.c | $(BUILD_PATH)/obj/
 	$(CC) $^ -o $@ $(CFLAGS)
 
-$(BUILD_PATH)/array:  ./src/array/main.c  $(OBJECTS_ARRAY)  | $(BUILD_PATH)/
+$(BUILD_PATH)/array-%:  ./src/array/%.c  $(OBJECTS_ARRAY)  | $(BUILD_PATH)/
 	$(CC) $^ -o $@ $(CFLAGS) -g3 -Wall
-$(BUILD_PATH)/string: ./src/string/main.c $(OBJECTS_STRING) | $(BUILD_PATH)/
+$(BUILD_PATH)/string-%: ./src/string/%.c $(OBJECTS_STRING) | $(BUILD_PATH)/
 	$(CC) $^ -o $@ ../modules/libunic/bin/libunic.a $(CFLAGS) -g3 -Wall
-$(BUILD_PATH)/list:   ./src/list/main.c   $(OBJECTS_LIST)   | $(BUILD_PATH)/
+$(BUILD_PATH)/list-%:   ./src/list/%.c   $(OBJECTS_LIST)   | $(BUILD_PATH)/
 	$(CC) $^ -o $@ $(CFLAGS) -g3 -Wall
-$(BUILD_PATH)/map:    ./src/map/main.c    $(OBJECTS_MAP)    | $(BUILD_PATH)/
+$(BUILD_PATH)/map-%:    ./src/map/%.c    $(OBJECTS_MAP)    | $(BUILD_PATH)/
 	$(CC) $^ -o $@ $(CFLAGS) -g3 -Wall
-$(BUILD_PATH)/set:    ./src/set/main.c    $(OBJECTS_SET)    | $(BUILD_PATH)/
+$(BUILD_PATH)/set-%:    ./src/set/%.c    $(OBJECTS_SET)    | $(BUILD_PATH)/
 	$(CC) $^ -o $@ $(CFLAGS) -g3 -Wall
 
 ########################################################################################################################