--- a/make-rules/attpackagemake.mk	Mon May 18 13:04:23 2015 -0700
+++ b/make-rules/attpackagemake.mk	Mon May 18 14:11:16 2015 -0700
@@ -62,9 +62,9 @@
 COMPONENT_INSTALL_ENV = $(COMPONENT_BUILD_ENV)
 COMPONENT_INSTALL_ARGS = HOSTTYPE="$(HOSTTYPE$(BITS))"
 COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
-COMPONENT_TEST_ARGS = $(COMPONENT_BUILD_ARGS)
+COMPONENT_TEST_ARGS = HOSTTYPE="$(HOSTTYPE$(BITS))"
 COMPONENT_SYSTEM_TEST_ENV = $(COMPONENT_BUILD_ENV)
-COMPONENT_SYSTEM_TEST_ARGS = $(COMPONENT_BUILD_ARGS) 
+COMPONENT_SYSTEM_TEST_ARGS = HOSTTYPE="$(HOSTTYPE$(BITS))"
 
 # build the configured source
 $(BUILD_DIR)/%/.built:	$(SOURCE_DIR)/.prep
@@ -98,7 +98,7 @@
 	-(cd $(COMPONENT_TEST_DIR) ; \
 		$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \
 		bin/package test $(COMPONENT_TEST_TARGETS) \
-		$(COMPONENT_TEST_ARGS)) \
+		$(COMPONENT_TEST_ARGS) \
 		&> $(COMPONENT_TEST_OUTPUT)
 	$(COMPONENT_POST_TEST_ACTION)
 	$(COMPONENT_TEST_CREATE_TRANSFORMS)
@@ -125,7 +125,7 @@
 	-(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
 		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
 		bin/package test $(COMPONENT_SYSTEM_TEST_TARGETS) \
-		$(COMPONENT_SYSTEM_TEST_ARGS)) \
+		$(COMPONENT_SYSTEM_TEST_ARGS) \
 		&> $(COMPONENT_TEST_OUTPUT)
 	$(COMPONENT_POST_SYSTEM_TEST_ACTION)
 	$(COMPONENT_TEST_CREATE_TRANSFORMS)