diff --git a/common.mk b/common.mk
index eee1b61..27914c4 100644
--- a/common.mk
+++ b/common.mk
@@ -279,7 +279,7 @@ $$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.S $$($(1)_MAKEFILE) $(wildcard $(ROOT)*
 $$($(1)_AR): $$($(1)_OBJ_FILES) $$($(1)_SRC_FILES)
 	$(vecho) "AR $$@"
 	$(Q) mkdir -p $$(dir $$@)
-	$(Q) $(AR) cru $$@ $$^
+	$(Q) $(AR) cru $$@ $$(filter %.o,$$^)
 
 COMPONENT_ARS += $$($(1)_AR)
 
diff --git a/tests/Makefile b/tests/Makefile
index 476fc7b..cd8bd54 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -6,11 +6,9 @@ PROGRAM_SRC_DIR = $(PROGRAM_DIR) $(PROGRAM_DIR)cases
 PROGRAM_INC_DIR = $(PROGRAM_DIR)unity/src
 PROGRAM_EXTRA_SRC_FILES = $(PROGRAM_DIR)unity/src/unity.c
 
-# append -u <basename_test_entry to the linker arguments for
-# each source file in the 'cases' directory, so the test case
-# entries get added to the compiled binary
 TESTCASE_SRC_FILES = $(wildcard $(PROGRAM_DIR)cases/*.c)
-TESTCASE_ENTRIES = $(sort $(patsubst %.c,%,$(TESTCASE_SRC_FILES)))
-EXTRA_LDFLAGS = $(foreach entry,$(TESTCASE_ENTRIES),$(BUILD_DIR)program/$(entry).o)
+
+# Link every object in the 'program' archive, to pick up constructor functions for test cases
+EXTRA_LDFLAGS = -Wl,--whole-archive $(BUILD_DIR)program.a -Wl,--no-whole-archive
 
 include ../common.mk