diff --git a/mk/tests.mk b/mk/tests.mk
index 6eb3ff61c26..be3bf05e42d 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -64,7 +64,7 @@ STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs)
 ifdef CTEST_VALGRIND
   CFG_RUN_CTEST=$(call CFG_RUN_TEST,$(2))
 else
-  CFG_RUN_CTEST=$(call CFG_RUN,$(TARGET_HOST_LIB$(1)),$(2))
+  CFG_RUN_CTEST=$(call CFG_RUN,$(TLIB$(1)_T_$(3)_H_$(3)),$(2))
 endif
 
 ######################################################################
@@ -259,68 +259,77 @@ PRETTY_PRETTY_ARGS$(1)-T-$(2)-H-$(3) := 		\
         --build-base test/pretty/				\
         --mode pretty
 
-check-stage$(1)-T-$(2)-H-$(3)-cfail-dummy:			\
+check-stage$(1)-T-$(2)-H-$(3)-cfail-dummy:		\
 		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
 	    $$(SREQ$(1)_T_$(2)_H_$(3))				\
         $$(CFAIL_TESTS)
-	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(CFAIL_ARGS$(1)-$(2))
+	@$$(call E, run cfail: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(CFAIL_ARGS$(1)-T-$(2)-H-$(3))
 
-check-stage$(1)-T-$(2)-H-$(3)-rfail-dummy:			\
+check-stage$(1)-T-$(2)-H-$(3)-rfail-dummy:		\
 		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
 	    $$(SREQ$(1)_T_$(2)_H_$(3))				\
         $$(RFAIL_TESTS)
-	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RFAIL_ARGS$(1)-$(2))
+	@$$(call E, run rfail: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(RFAIL_ARGS$(1)-T-$(2)-H-$(3))
 
-check-stage$(1)-T-$(2)-H-$(3)-rpass-dummy:			\
+check-stage$(1)-T-$(2)-H-$(3)-rpass-dummy:		\
 		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
 	    $$(SREQ$(1)_T_$(2)_H_$(3))				\
         $$(RPASS_TESTS)
-	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RPASS_ARGS$(1)-$(2))
+	@$$(call E, run rpass: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(RPASS_ARGS$(1)-T-$(2)-H-$(3))
 
-check-stage$(1)-T-$(2)-H-$(3)-bench-dummy:			\
+check-stage$(1)-T-$(2)-H-$(3)-bench-dummy:		\
 		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
 	    $$(SREQ$(1)_T_$(2)_H_$(3))				\
         $$(BENCH_TESTS)
-	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(BENCH_ARGS$(1)-$(2))
+	@$$(call E, run bench: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(BENCH_ARGS$(1)-T-$(2)-H-$(3))
 
-check-stage$(1)-T-$(2)-H-$(3)-perf-dummy:			\
+check-stage$(1)-T-$(2)-H-$(3)-perf-dummy:		\
 		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
         $$(SREQ$(1)_T_$(2)_H_$(3))				\
         $$(BENCH_TESTS)
 	@$$(call E, perf: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PERF_ARGS$(1)-$(2))
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(PERF_ARGS$(1)-T-$(2)-H-$(3))
 
 check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-dummy:	\
-		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
-        $$(SREQ$(1)_T_$(2)_H_$(3))				\
+		$$(HBIN$(1)_H_$(3))/compiletest$$(X)		\
+        $$(SREQ$(1)_T_$(2)_H_$(3))					\
         $$(RPASS_TESTS)
-	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RPASS_ARGS$(1)-$(2))
+	@$$(call E, run pretty-rpass: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(PRETTY_RPASS_ARGS$(1)-T-$(2)-H-$(3))
 
 check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-dummy:	\
-		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
-        $$(SREQ$(1)_T_$(2)_H_$(3))				\
+		$$(HBIN$(1)_H_$(3))/compiletest$$(X)		\
+        $$(SREQ$(1)_T_$(2)_H_$(3))					\
         $$(RFAIL_TESTS)
-	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RFAIL_ARGS$(1)-$(2))
+	@$$(call E, run pretty-rfail: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(PRETTY_RFAIL_ARGS$(1)-T-$(2)-H-$(3))
 
 check-stage$(1)-T-$(2)-H-$(3)-pretty-bench-dummy:	\
-		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
-		$$(SREQ$(1)_T_$(2)_H_$(3))				\
+		$$(HBIN$(1)_H_$(3))/compiletest$$(X)		\
+		$$(SREQ$(1)_T_$(2)_H_$(3))					\
         $$(BENCH_TESTS)
-	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_BENCH_ARGS$(1)-$(2))
+	@$$(call E, run pretty-bench: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(PRETTY_BENCH_ARGS$(1)-T-$(2)-H-$(3))
 
 check-stage$(1)-T-$(2)-H-$(3)-pretty-pretty-dummy:	\
-		$$(HBIN$(1)_H_$(3))/compiletest$$(X)	\
-        $$(SREQ$(1)_T_$(2)_H_$(3))				\
+		$$(HBIN$(1)_H_$(3))/compiletest$$(X)		\
+        $$(SREQ$(1)_T_$(2)_H_$(3))					\
         $$(PRETTY_TESTS)
-	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_PRETTY_ARGS$(1)-$(2))
+	@$$(call E, run pretty-pretty: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
+		$$(PRETTY_PRETTY_ARGS$(1)-T-$(2)-H-$(3))
 
 endef