--- a/make-rules/makemaker.mk	Tue Oct 18 14:50:09 2016 -0700
+++ b/make-rules/makemaker.mk	Tue Oct 18 14:50:56 2016 -0700
@@ -104,6 +104,7 @@
 
 
 # Define bit specific and Perl version specific filenames.
+COMPONENT_TEST_BUILD_DIR = $(BUILD_DIR)/test/$(MACH$(BITS))-$(PERL_VERSION)
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-$(PERL_VERSION)-$(BITS).master
 COMPONENT_TEST_OUTPUT = $(COMPONENT_TEST_BUILD_DIR)/test-$(PERL_VERSION)-$(BITS)-results
 COMPONENT_TEST_DIFFS =  $(COMPONENT_TEST_BUILD_DIR)/test-$(PERL_VERSION)-$(BITS)-diffs

--- a/make-rules/setup.py.mk	Tue Oct 18 14:50:09 2016 -0700
+++ b/make-rules/setup.py.mk	Tue Oct 18 14:50:56 2016 -0700
@@ -146,6 +146,7 @@
 	$(TOUCH) $@
 
 # Define bit specific and Python version specific filenames.
+COMPONENT_TEST_BUILD_DIR = $(BUILD_DIR)/test/$(MACH$(BITS))-$(PYTHON_VERSION)
 COMPONENT_TEST_MASTER =	$(COMPONENT_TEST_RESULTS_DIR)/results-$(PYTHON_VERSION)-$(BITS).master
 COMPONENT_TEST_OUTPUT =	$(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-results
 COMPONENT_TEST_DIFFS =	$(COMPONENT_TEST_BUILD_DIR)/test-$(PYTHON_VERSION)-$(BITS)-diffs