--- a/components/popt/Makefile	Thu Jan 29 14:57:20 2015 -0800
+++ b/components/popt/Makefile	Mon Feb 02 11:55:58 2015 -0800
@@ -64,6 +64,10 @@
 
 PKG_PROTO_DIRS +=	$(COMPONENT_DIR)/files
 
+# Master test results are the same for 32-bit and 64-bit, so override
+# here, rather than create multiple identical master files.
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets