-test_PROGRAMS:=$(basename $(notdir $(wildcard $(SOURCES_DIR)/*.c)))
+wvtest_PROGRAMS:=$(addprefix fres-,$(basename $(notdir $(wildcard $(SOURCES_DIR)/*.c))))
-$(foreach t,$(test_PROGRAMS),\
-$(eval $(t)_SOURCES = $(t).c)\
-$(eval $(t)_LIBS = fosa m contract rt forb ulut)\
+CFLAGS += -DWVTEST_CONFIGURED
+
+$(foreach t,$(wvtest_PROGRAMS),\
+$(eval $(t)_SOURCES = $(t:fres-%=%).c)\
+$(eval $(t)_LIBS = fosa m contract rt forb ulut wvtest)\
)