diff --git a/test/extended_euclidean_test.cpp b/test/extended_euclidean_test.cpp
index 2978083..34c11f0 100644
--- a/test/extended_euclidean_test.cpp
+++ b/test/extended_euclidean_test.cpp
@@ -12,10 +12,11 @@
 #endif
 
 #ifndef DISABLE_MP_TESTS
+#include <boost/integer/extended_euclidean.hpp>
+#include <boost/cstdint.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/integer/common_factor.hpp>
-#include <boost/integer/extended_euclidean.hpp>
 
 using boost::multiprecision::int128_t;
 using boost::multiprecision::int256_t;
@@ -46,9 +47,9 @@ void test_extended_euclidean()
 
 int main()
 {
-    test_extended_euclidean<int16_t>();
-    test_extended_euclidean<int32_t>();
-    test_extended_euclidean<int64_t>();
+    test_extended_euclidean<boost::int16_t>();
+    test_extended_euclidean<boost::int32_t>();
+    test_extended_euclidean<boost::int64_t>();
     test_extended_euclidean<int128_t>();
 
     return boost::report_errors();;
diff --git a/test/mod_inverse_test.cpp b/test/mod_inverse_test.cpp
index 793c5c1..4ae17d7 100644
--- a/test/mod_inverse_test.cpp
+++ b/test/mod_inverse_test.cpp
@@ -12,10 +12,12 @@
 #endif
 
 #ifndef DISABLE_MP_TESTS
+#include <boost/integer/mod_inverse.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/optional/optional.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/multiprecision/cpp_int.hpp>
 #include <boost/integer/common_factor.hpp>
-#include <boost/integer/mod_inverse.hpp>
 
 using boost::multiprecision::int128_t;
 using boost::multiprecision::int256_t;
@@ -58,9 +60,9 @@ void test_mod_inverse()
 
 int main()
 {
-    test_mod_inverse<int16_t>();
-    test_mod_inverse<int32_t>();
-    test_mod_inverse<int64_t>();
+    test_mod_inverse<boost::int16_t>();
+    test_mod_inverse<boost::int32_t>();
+    test_mod_inverse<boost::int64_t>();
     test_mod_inverse<int128_t>();
 
     return boost::report_errors();