diff -r ed1ff241f25d -r 2d05f68d43d8 components/gpatch/Makefile
--- a/components/gpatch/Makefile	Thu Aug 06 13:59:44 2015 -0700
+++ b/components/gpatch/Makefile	Thu Aug 06 15:11:29 2015 -0700
@@ -52,6 +52,8 @@
 
 ASLR_MODE = $(ASLR_ENABLE)
 
+COMPONENT_SYSTEM_TEST_ENV += PATCH=$(GPATCH)
+
 # common targets
 configure:	$(CONFIGURE_64)
 
@@ -61,7 +63,12 @@
 
 test:		$(TEST_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+# Although system-test doesn't run against the built bits, the tests
+# require the bits are built.  Using BUILD_64 as a pre-requisite
+# to system-test separates the compilation output from the
+# test output, so the master test results will be consistent between
+# test and system-test targets.
+system-test:    $(BUILD_64) $(SYSTEM_TEST_64)
 
 
 REQUIRED_PACKAGES += system/library