diff --git a/test/Function/Makefile b/test/Function/Makefile
index d96fa95..68181ae 100644
--- a/test/Function/Makefile
+++ b/test/Function/Makefile
@@ -1,7 +1,6 @@
 BIN = FunctionTest$(BIN_SUFFIX)
 SRC = FunctionTest.cpp
 OBJ = $(SRC:.cpp=.o)
-override LDLIBS += -lboost_test_exec_monitor
 
 .PHONY: all clean
 all: $(BIN)
diff --git a/test/Function/make.msvc.bat b/test/Function/make.msvc.bat
new file mode 100755
index 0000000..9b68189
--- /dev/null
+++ b/test/Function/make.msvc.bat
@@ -0,0 +1,5 @@
+cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" FunctionTest.cpp
+
+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" ..\..\lib\loki.lib FunctionTest.obj
+
+del *.obj
\ No newline at end of file
diff --git a/test/Makefile b/test/Makefile
index a8ebd8c..7d03302 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,7 +9,6 @@ export BIN_SUFFIX =
 endif
 
 SUBTARGETS_ORIG := $(patsubst %/,%,$(dir $(wildcard */Makefile)))
-SUBTARGETS_FILTER_OUT = Function
 SUBTARGETS := $(filter-out $(SUBTARGETS_FILTER_OUT),$(SUBTARGETS_ORIG))
 	
 SUBTARGETS_CLEAN := $(addsuffix -clean,$(SUBTARGETS))
diff --git a/test/make.msvc.bat b/test/make.msvc.bat
index d27e784..71113e5 100755
--- a/test/make.msvc.bat
+++ b/test/make.msvc.bat
@@ -7,6 +7,10 @@ cd Factory
 call make.msvc.bat
 cd ..
 
+cd Function
+call make.msvc.bat
+cd ..
+
 cd Longevity
 call make.msvc.bat
 cd ..