--- a/make/RunTests.gmk	Mon Sep 25 10:21:23 2017 +0200
+++ b/make/RunTests.gmk	Mon Sep 25 10:32:00 2017 +0200
@@ -38,8 +38,8 @@
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, , RunTests.gmk))
 
-TEST_RESULTS_DIR := $(BUILD_OUTPUT)/test-results
-TEST_SUPPORT_DIR := $(BUILD_OUTPUT)/test-support
+TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results
+TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support
 
 
 ################################################################################