diff --git a/makefiles/targets/include.mk b/makefiles/targets/include.mk
index 20e1bf5..32c99b9 100644
--- a/makefiles/targets/include.mk
+++ b/makefiles/targets/include.mk
@@ -26,10 +26,10 @@
 ##-------------------##
 ##---]  TARGETS  [---##
 ##-------------------##
-include $(ONF_MAKEDIR)/targets/clean.mk
-include $(ONF_MAKEDIR)/targets/check.mk
-include $(ONF_MAKEDIR)/targets/sterile.mk
-include $(ONF_MAKEDIR)/targets/test/include.mk
+include $(onf-mk-dir)/targets/clean.mk
+include $(onf-mk-dir)/targets/check.mk
+include $(onf-mk-dir)/targets/sterile.mk
+include $(onf-mk-dir)/targets/test/include.mk
 
 $(if $(DEBUG),$(warning LEAVE))
 
diff --git a/makefiles/targets/test/include.mk b/makefiles/targets/test/include.mk
index a706bfd..54b9ef8 100644
--- a/makefiles/targets/test/include.mk
+++ b/makefiles/targets/test/include.mk
@@ -24,7 +24,7 @@
 $(if $(DEBUG),$(warning ENTER))
 
 # Special snowflake: repository-dependent test target
--include $(ONF_MAKEDIR)/targets/test/$(--repo-name--).mk
+-include $(onf-mk-dir)/targets/test/$(--repo-name--).mk
 
 $(if $(DEBUG),$(warning LEAVE))