diff --git a/code/BoostWorkaround/boost/format.hpp b/code/BoostWorkaround/boost/format.hpp
index 83c164cd3..b453a356f 100644
--- a/code/BoostWorkaround/boost/format.hpp
+++ b/code/BoostWorkaround/boost/format.hpp
@@ -9,7 +9,7 @@
 #ifndef AI_BOOST_FORMAT_DUMMY_INCLUDED
 #define AI_BOOST_FORMAT_DUMMY_INCLUDED
 
-#ifndef BOOST_FORMAT_HPP
+#if (!defined BOOST_FORMAT_HPP) || (defined ASSIMP_FORCE_NOBOOST)
 
 #include <string>
 #include <vector>
diff --git a/test/unit/utNoBoostTest.h b/test/unit/utNoBoostTest.h
index 4b492e8a1..5fe3ceabd 100644
--- a/test/unit/utNoBoostTest.h
+++ b/test/unit/utNoBoostTest.h
@@ -3,6 +3,7 @@
 
 namespace noboost {
 
+#define ASSIMP_FORCE_NOBOOST
 #include "..\..\code\BoostWorkaround\boost\format.hpp"
 	using boost::format;
 	using boost::str;