diff --git a/makefiles/Makefile.unix.mk b/makefiles/Makefile.unix.mk
index 0fe397c0de..b76f75bf51 100644
--- a/makefiles/Makefile.unix.mk
+++ b/makefiles/Makefile.unix.mk
@@ -13,12 +13,11 @@ GEN_PATH = $(subst /,$S,$(GEN_DIR))
 OBJ_DIR = $(OR_ROOT)objs
 LIB_DIR = $(OR_ROOT)lib
 BIN_DIR = $(OR_ROOT)bin
-TEST_DIR  = $(OR_ROOT)examples/tests
-TEST_PATH = $(subst /,$S,$(TEST_DIR))
-CC_EX_DIR  = $(OR_ROOT)examples/cpp
-CC_EX_PATH = $(subst /,$S,$(CC_EX_DIR))
 FZ_EX_DIR  = $(OR_ROOT)examples/flatzinc
 FZ_EX_PATH = $(subst /,$S,$(FZ_EX_DIR))
+# C++ relevant directory
+CC_EX_DIR  = $(OR_ROOT)examples/cpp
+CC_EX_PATH = $(subst /,$S,$(CC_EX_DIR))
 # Python relevant directory
 PYTHON_EX_DIR  = $(OR_ROOT)examples/python
 PYTHON_EX_PATH = $(subst /,$S,$(PYTHON_EX_DIR))
@@ -33,6 +32,9 @@ DOTNET_EX_PATH = $(subst /,$S,$(DOTNET_EX_DIR))
 # Contrib examples directory
 CONTRIB_EX_DIR = $(OR_ROOT)examples/contrib
 CONTRIB_EX_PATH = $(subst /,$S,$(CONTRIB_EX_DIR))
+# Test examples directory
+TEST_DIR  = $(OR_ROOT)examples/tests
+TEST_PATH = $(subst /,$S,$(TEST_DIR))
 
 O = o
 ifeq ($(PLATFORM),LINUX)
diff --git a/makefiles/Makefile.win.mk b/makefiles/Makefile.win.mk
index 25e90115fc..9553e30b46 100644
--- a/makefiles/Makefile.win.mk
+++ b/makefiles/Makefile.win.mk
@@ -23,12 +23,11 @@ GEN_PATH = $(subst /,$S,$(GEN_DIR))
 OBJ_DIR = $(OR_ROOT)objs
 LIB_DIR = $(OR_ROOT)lib
 BIN_DIR = $(OR_ROOT)bin
-TEST_DIR  = $(OR_ROOT)examples/tests
-TEST_PATH = $(subst /,$S,$(TEST_DIR))
-CC_EX_DIR  = $(OR_ROOT)examples/cpp
-CC_EX_PATH = $(subst /,$S,$(CC_EX_DIR))
 FZ_EX_DIR  = $(OR_ROOT)examples/flatzinc
 FZ_EX_PATH = $(subst /,$S,$(FZ_EX_DIR))
+# C++ relevant directory
+CC_EX_DIR  = $(OR_ROOT)examples/cpp
+CC_EX_PATH = $(subst /,$S,$(CC_EX_DIR))
 # Python relevant directory
 PYTHON_EX_DIR  = $(OR_ROOT)examples/python
 PYTHON_EX_PATH = $(subst /,$S,$(PYTHON_EX_DIR))
@@ -43,6 +42,9 @@ DOTNET_EX_PATH = $(subst /,$S,$(DOTNET_EX_DIR))
 # Contrib examples directory
 CONTRIB_EX_DIR = $(OR_ROOT)examples/contrib
 CONTRIB_EX_PATH = $(subst /,$S,$(CONTRIB_EX_DIR))
+# Test examples directory
+TEST_DIR  = $(OR_ROOT)examples/tests
+TEST_PATH = $(subst /,$S,$(TEST_DIR))
 
 O = obj
 L = lib