--- a/components/python/argparse/Makefile	Wed Jun 24 08:55:25 2015 -0700
+++ b/components/python/argparse/Makefile	Wed Jun 24 09:23:50 2015 -0700
@@ -37,6 +37,7 @@
 # The argparse module was integrated into Python 2.7, so we should only deliver
 # a 2.6 module.
 PYTHON_VERSIONS = 2.6
+PYTHON_VERSION = 2.6
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -45,6 +46,10 @@
 COMPONENT_TEST_DIR =	$(COMPONENT_SRC)/test
 COMPONENT_TEST_ARGS =	test_argparse.py
 
+COMPONENT_SYSTEM_TEST_ENV =
+COMPONENT_SYSTEM_TEST_CMD=	$(PYTHON.2.6)
+COMPONENT_SYSTEM_TEST_ARGS =	test_argparse.py
+
 # The additional argparse specific set of transforms to be applied to the test
 # results to try to normalize them.
 COMPONENT_TEST_TRANSFORMS += \
@@ -52,12 +57,10 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# common targets
 build:		$(BUILD_NO_ARCH)
 
 install:	$(INSTALL_NO_ARCH)
 
 test:		$(TEST_NO_ARCH)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
+system-test:    $(SYSTEM_TEST_NO_ARCH)

--- a/make-rules/setup.py.mk	Wed Jun 24 08:55:25 2015 -0700
+++ b/make-rules/setup.py.mk	Wed Jun 24 09:23:50 2015 -0700
@@ -198,6 +198,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)
 	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
 	-(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \