diff --git a/test/test-runner.cpp b/test/test-runner.cpp
index 1a7c6dd57..fac41ea70 100644
--- a/test/test-runner.cpp
+++ b/test/test-runner.cpp
@@ -1,5 +1,21 @@
 /* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
-#define BOOST_TEST_MAIN
+#define BOOST_TEST_MODULE icinga2
+#define BOOST_TEST_NO_MAIN
+#define BOOST_TEST_ALTERNATIVE_INIT_API
 
 #include <BoostTestTargetConfig.h>
+#include <boost/test/unit_test.hpp>
+#include <cstdlib>
+
+int BOOST_TEST_CALL_DECL
+main(int argc, char **argv)
+{
+	std::_Exit(boost::unit_test::unit_test_main(init_unit_test, argc, argv));
+	return EXIT_FAILURE;
+}
+
+#ifdef _WIN32
+#include <boost/test/impl/unit_test_main.ipp>
+#include <boost/test/impl/framework.ipp>
+#endif /* _WIN32 */