--- a/components/python/argparse/Makefile	Thu Jul 02 09:34:17 2015 +0100
+++ b/components/python/argparse/Makefile	Thu Jul 02 08:59:20 2015 -0700
@@ -37,7 +37,6 @@
 # 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

--- a/components/python/simplejson/Makefile	Thu Jul 02 09:34:17 2015 +0100
+++ b/components/python/simplejson/Makefile	Thu Jul 02 08:59:20 2015 -0700
@@ -54,14 +54,16 @@
 	'-e "s|\(creating build/temp.solaris\).*|\1|" ' \
 	'-e "s|\(Ran 132 tests in\).*|\1|" '
 
-# common targets
+COMPONENT_SYSTEM_TEST_DIR =	$(COMPONENT_SRC)
+COMPONENT_SYSTEM_TEST_ENV =
+COMPONENT_SYSTEM_TEST_ARGS =	./setup.py test
+
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 
 test:		$(TEST_32_and_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
+system-test:    $(SYSTEM_TEST_32_and_64)
 
 REQUIRED_PACKAGES += system/library

--- a/components/python/twisted-web2/Makefile	Thu Jul 02 09:34:17 2015 +0100
+++ b/components/python/twisted-web2/Makefile	Thu Jul 02 08:59:20 2015 -0700
@@ -60,6 +60,11 @@
 COMPONENT_TEST_CMD =	/usr/demo/twisted-python$(PYTHON_VERSION)/trial
 COMPONENT_TEST_ARGS =	twisted/web2/test/test_xmlrpc.py
 
+COMPONENT_SYSTEM_TEST_DIR =	$(COMPONENT_SRC)
+COMPONENT_SYSTEM_TEST_ENV =
+COMPONENT_SYSTEM_TEST_CMD =	/usr/demo/twisted-python$(PYTHON_VERSION)/trial
+COMPONENT_SYSTEM_TEST_ARGS =	twisted/web2/test/test_xmlrpc.py
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 build:          $(BUILD_NO_ARCH)
@@ -68,4 +73,4 @@
 
 test:           $(TEST_NO_ARCH)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:    $(SYSTEM_TEST_NO_ARCH)

--- a/components/python/twisted/Makefile	Thu Jul 02 09:34:17 2015 +0100
+++ b/components/python/twisted/Makefile	Thu Jul 02 08:59:20 2015 -0700
@@ -70,6 +70,11 @@
 COMPONENT_TEST_TRANSFORMER =    $(NAWK)
 COMPONENT_TEST_TRANSFORMS = "'/^\[FAIL\]: / { print }; /^\[ERROR\]: / { print }; /^Ran / { sub(\" tests in .+s\", \" tests in\"); print }; /^FAILED / { print }; /^OK / { print };'"
 
+COMPONENT_SYSTEM_TEST_DIR=	$(COMPONENT_SRC)
+COMPONENT_SYSTEM_TEST_ENV=
+COMPONENT_SYSTEM_TEST_CMD=	/usr/demo/twisted-python$(PYTHON_VERSION)/trial
+COMPONENT_SYSTEM_TEST_ARGS=	twisted
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 build:		$(BUILD_32_and_64)
@@ -78,6 +83,6 @@
 
 test:		$(TEST_32_and_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:    $(SYSTEM_TEST_32_and_64)
 
 REQUIRED_PACKAGES += system/library

--- a/components/python/zope-interface/Makefile	Thu Jul 02 09:34:17 2015 +0100
+++ b/components/python/zope-interface/Makefile	Thu Jul 02 08:59:20 2015 -0700
@@ -61,13 +61,17 @@
 	'-e "s|\(Ran 1 test in\).*|\1|" ' \
 	'-e "s|\(Ran .* tests in\).*|\1|" '
 
-# common targets
+COMPONENT_SYSTEM_TEST_ARGS=	../runtests.sh
+COMPONENT_SYSTEM_TEST_CMD=	/bin/sh
+COMPONENT_SYSTEM_TEST_DIR=	$(SOURCE_DIR)
+COMPONENT_SYSTEM_TEST_ENV+=	PYTHON=$(PYTHON)
+
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 
 test:		$(TEST_32_and_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:    $(SYSTEM_TEST_32_and_64)
 
 REQUIRED_PACKAGES += system/library

--- 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) \