O_FILES := $(filter-out $(outdir)/test%, $(O_FILES))
TEST_EXECUTABLE = $(outdir)/test-$(NAME)
-TEST_LOADLIBES = $(LOADLIBES) -lboost_unit_test_framework
+TEST_MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(TEST_MODULE_LIBS)))
+
+TEST_LOADLIBES = $(TEST_MODULE_LIBES) $(LOADLIBES) $(CXXABI_LIBS)