diff --git a/test/Makefile b/test/Makefile
index 322e4cc..ae9a5cf 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -57,6 +57,8 @@
 
 
 # ============== Project settings ==============
+# Project's name
+PROJECT         := utl
 # Excecutable's name
 TARGET          := utlTest
 # Source directories list(space seperated).
@@ -98,7 +100,7 @@ MAP_FLAG        := -Xlinker -Map=$(BUILD_DIR)/$(MAP_FILE)
 # We double-$$ for double evaluating.
 DOCKER_VOL_DIR  := "$${PWD%/*}"
 DOCKER_WRK_DIR  := test
-DOCKER_RUN      := docker run --rm -v $(DOCKER_VOL_DIR):/usr/src/$(TARGET) -w /usr/src/$(TARGET)/$(DOCKER_WRK_DIR)
+DOCKER_RUN      := docker run --rm -v $(DOCKER_VOL_DIR):/usr/src/$(PROJECT) -w /usr/src/$(PROJECT)/$(DOCKER_WRK_DIR)
 
 # ============== Default settings ==============
 # compiler and compiler flags. By default docker is not used.
@@ -109,6 +111,9 @@ DOCKER          :=
 #
 # =========== Main body and Patterns ===========
 #
+ifeq ($(OS), Windows_NT)
+	TARGET := $(TARGET).exe
+endif
 INC     := $(foreach dir,$(INC_DIR_LIST),-I$(dir))
 DEF     := $(foreach def,$(PRE_DEFS),-D$(def))
 EXC     := $(foreach fil,$(EXC_FILE_LIST),                              \