diff --git a/ELFIOTest/ELFIOTest.cpp b/ELFIOTest/ELFIOTest.cpp
index 07b10c389c22f5f518da735d022c27c2947d2696..b6f8b9850c28b40485544a9b92700a42a71991ef 100644
--- a/ELFIOTest/ELFIOTest.cpp
+++ b/ELFIOTest/ELFIOTest.cpp
@@ -4,7 +4,9 @@
 #endif
 
 #define BOOST_TEST_MAIN
+#ifndef _MSC_VER
 #define BOOST_TEST_DYN_LINK
+#endif
 #define BOOST_TEST_MODULE ELFIO_Test
 #include <boost/test/unit_test.hpp>
 
diff --git a/ELFIOTest/Makefile b/ELFIOTest/Makefile
index 21f7473b35e19d511ab86441e2eee465e229da9e..ceb4c930481bcff78f79897cf25d1299c3963969 100644
--- a/ELFIOTest/Makefile
+++ b/ELFIOTest/Makefile
@@ -1,6 +1,6 @@
 CXX=g++
 CPPFLAGS=-c -Wall -std=c++0x -I..
-LDLIBS=-lboost_unit_test_framework-mt
+LDLIBS=-lboost_unit_test_framework
 
 ELFIODIR=../elfio/
 SOURCES=ELFIOTest.cpp ELFIOTest1.cpp