--- a/make-rules/makemaker.mk	Tue Oct 21 02:05:30 2014 -0700
+++ b/make-rules/makemaker.mk	Tue Oct 21 12:20:30 2014 -0700
@@ -99,7 +99,8 @@
 COMPONENT_TEST_ENV +=	$(COMMON_PERL_ENV)
 $(BUILD_DIR)/%/.tested:	$(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_TEST_ACTION)
-	(cd $(COMPONENT_TEST_DIR) ; $(ENV) $(COMPONENT_TEST_ENV) \
+	(cd $(COMPONENT_TEST_DIR) ; $(COMPONENT_TEST_ENV_CMD) \
+		$(COMPONENT_TEST_ENV) \
 		$(COMPONENT_TEST_CMD) \
 			$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
 	$(COMPONENT_POST_TEST_ACTION)