diff --git a/include/boost/test/detail/config.hpp b/include/boost/test/detail/config.hpp
index 5effc72f..8d0f7c41 100644
--- a/include/boost/test/detail/config.hpp
+++ b/include/boost/test/detail/config.hpp
@@ -143,6 +143,10 @@ class type_info;
 #define BOOST_PP_VARIADICS 1
 #endif
 
+#if defined(__NVCC__)
+#define BOOST_PP_VARIADICS 1
+#endif
+
 #endif /* ifndef BOOST_PP_VARIADICS */
 
 // some versions of VC exibit a manifest error with this BOOST_UNREACHABLE_RETURN
diff --git a/include/boost/test/unit_test_suite.hpp b/include/boost/test/unit_test_suite.hpp
index be862ef2..f74a4c47 100644
--- a/include/boost/test/unit_test_suite.hpp
+++ b/include/boost/test/unit_test_suite.hpp
@@ -13,6 +13,7 @@
 #define BOOST_TEST_UNIT_TEST_SUITE_HPP_071894GER
 
 // Boost.Test
+#include <boost/test/detail/config.hpp>
 #include <boost/test/framework.hpp>
 #include <boost/test/tree/auto_registration.hpp>
 #include <boost/test/tree/test_case_template.hpp>