diff --git a/test/atomicity.cpp b/test/atomicity.cpp
index 281d560..f1a64f5 100644
--- a/test/atomicity.cpp
+++ b/test/atomicity.cpp
@@ -28,10 +28,16 @@
 
 #include <boost/atomic.hpp>
 #include <boost/bind.hpp>
+#include <boost/function.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/date_time/posix_time/time_formatters.hpp>
 #include <boost/test/test_tools.hpp>
 #include <boost/test/included/test_exec_monitor.hpp>
-#include <boost/thread.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_time.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition_variable.hpp>
 
 /* helper class to let two instances of a function race against each
 other, with configurable timeout and early abort on detection of error */
diff --git a/test/ordering.cpp b/test/ordering.cpp
index 806f174..f769855 100644
--- a/test/ordering.cpp
+++ b/test/ordering.cpp
@@ -27,10 +27,17 @@
 // fences work as expected if this test program does not
 // report an error.
 #include <boost/atomic.hpp>
+#include <boost/bind.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/date_time/posix_time/time_formatters.hpp>
 #include <boost/test/test_tools.hpp>
 #include <boost/test/included/test_exec_monitor.hpp>
-#include <boost/thread.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_time.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/barrier.hpp>
 
 // Two threads perform the following operations:
 //