--- a/make-rules/setup.py.mk	Thu Jul 02 09:34:17 2015 +0100
+++ b/make-rules/setup.py.mk	Thu Jul 02 08:59:20 2015 -0700
@@ -210,8 +210,8 @@
 $(BUILD_DIR)/%/.system-tested-and-compared:    $(COMPONENT_SYSTEM_TEST_DEP)
 	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
 	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
-	$(RM) -rf $(BUILD_DIR)/$(MACH)-$(PYTHON_VERSION)
-	$(MKDIR) $(BUILD_DIR)/$(MACH)-$(PYTHON_VERSION)
+	$(RM) -rf $(@D)
+	$(MKDIR) $(@D)
 	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
 	-(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \