diff --git a/include/boost/core/lightweight_test.hpp b/include/boost/core/lightweight_test.hpp
index ec75881..2cd02e7 100644
--- a/include/boost/core/lightweight_test.hpp
+++ b/include/boost/core/lightweight_test.hpp
@@ -10,7 +10,7 @@
 //
 //  boost/core/lightweight_test.hpp - lightweight test library
 //
-//  Copyright (c) 2002, 2009 Peter Dimov
+//  Copyright (c) 2002, 2009, 2014 Peter Dimov
 //  Copyright (2) Beman Dawes 2010, 2011
 //  Copyright (3) Ion Gaztanaga 2013
 //
@@ -22,7 +22,6 @@
 #include <boost/assert.hpp>
 #include <boost/current_function.hpp>
 #include <boost/core/no_exceptions_support.hpp>
-#include <boost/core/typeinfo.hpp>
 #include <iostream>
 
 //  IDE's like Visual Studio perform better if output goes to std::cout or
@@ -118,25 +117,6 @@ template<class T, class U> inline void test_ne_impl( char const * expr1, char co
     }
 }
 
-template< class T > inline void test_trait_impl( char const * trait, void (*)( T ),
-  bool expected, char const * file, int line, char const * function )
-{
-    if( T::value == expected )
-    {
-    }
-    else
-    {
-        BOOST_LIGHTWEIGHT_TEST_OSTREAM
-            << file << "(" << line << "): predicate '" << trait << "' ["
-            << BOOST_CORE_TYPEID(T).name() << "]"
-            << " test failed in function '" << function
-            << "' (should have been " << ( expected? "true": "false" ) << ")"
-            << std::endl;
-
-        ++boost::detail::test_errors();
-    }
-}
-
 } // namespace detail
 
 inline int report_errors()
@@ -186,7 +166,4 @@ inline int report_errors()
    #define BOOST_TEST_THROWS( EXPR, EXCEP )
 #endif
 
-#define BOOST_TEST_TRAIT_TRUE(type) ( ::boost::detail::test_trait_impl(#type, (void(*)type)0, true, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
-#define BOOST_TEST_TRAIT_FALSE(type) ( ::boost::detail::test_trait_impl(#type, (void(*)type)0, false, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
-
 #endif // #ifndef BOOST_CORE_LIGHTWEIGHT_TEST_HPP
diff --git a/include/boost/core/lightweight_test_trait.hpp b/include/boost/core/lightweight_test_trait.hpp
new file mode 100644
index 0000000..7eb4936
--- /dev/null
+++ b/include/boost/core/lightweight_test_trait.hpp
@@ -0,0 +1,55 @@
+#ifndef BOOST_CORE_LIGHTWEIGHT_TEST_TRAIT_HPP
+#define BOOST_CORE_LIGHTWEIGHT_TEST_TRAIT_HPP
+
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER)
+# pragma once
+#endif
+
+// boost/core/lightweight_test_trait.hpp
+//
+// BOOST_TEST_TRAIT_TRUE, BOOST_TEST_TRAIT_FALSE
+//
+// Copyright 2014 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/core/lightweight_test.hpp>
+#include <boost/core/typeinfo.hpp>
+
+namespace boost
+{
+
+namespace detail
+{
+
+template< class T > inline void test_trait_impl( char const * trait, void (*)( T ),
+  bool expected, char const * file, int line, char const * function )
+{
+    if( T::value == expected )
+    {
+    }
+    else
+    {
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM
+            << file << "(" << line << "): predicate '" << trait << "' ["
+            << BOOST_CORE_TYPEID(T).name() << "]"
+            << " test failed in function '" << function
+            << "' (should have been " << ( expected? "true": "false" ) << ")"
+            << std::endl;
+
+        ++boost::detail::test_errors();
+    }
+}
+
+} // namespace detail
+
+} // namespace boost
+
+#define BOOST_TEST_TRAIT_TRUE(type) ( ::boost::detail::test_trait_impl(#type, (void(*)type)0, true, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
+#define BOOST_TEST_TRAIT_FALSE(type) ( ::boost::detail::test_trait_impl(#type, (void(*)type)0, false, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
+
+#endif // #ifndef BOOST_CORE_LIGHTWEIGHT_TEST_TRAIT_HPP
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 8555338..8b87ea0 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -50,6 +50,8 @@ run get_pointer_test.cpp ;
 run lightweight_test_test.cpp ;
 run lightweight_test_test.cpp : : : <exception-handling>off : lightweight_test_test_no_except ;
 
+run lightweight_test_test2.cpp ;
+
 run-fail lightweight_test_fail.cpp ;
 run-fail lightweight_test_fail2.cpp ;
 run-fail lightweight_test_fail3.cpp ;
diff --git a/test/detail_iterator_test.cpp b/test/detail_iterator_test.cpp
index a2354f7..8a8141e 100644
--- a/test/detail_iterator_test.cpp
+++ b/test/detail_iterator_test.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/detail/iterator.hpp>
 #include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
 #include <cstddef>
 #include <list>
 
diff --git a/test/is_same_test.cpp b/test/is_same_test.cpp
index 08756e5..838db22 100644
--- a/test/is_same_test.cpp
+++ b/test/is_same_test.cpp
@@ -8,9 +8,8 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/iterator.hpp>
 #include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
 
 struct X
 {
diff --git a/test/iterator_test.cpp b/test/iterator_test.cpp
index d0ca885..3eb2902 100644
--- a/test/iterator_test.cpp
+++ b/test/iterator_test.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/iterator.hpp>
 #include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
 
 /*
 
diff --git a/test/lightweight_test_fail7.cpp b/test/lightweight_test_fail7.cpp
index 85ce8e9..ed393e6 100644
--- a/test/lightweight_test_fail7.cpp
+++ b/test/lightweight_test_fail7.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
 
 template<class T1, class T2> struct Y1
 {
diff --git a/test/lightweight_test_fail8.cpp b/test/lightweight_test_fail8.cpp
index f2311b0..7b6d486 100644
--- a/test/lightweight_test_fail8.cpp
+++ b/test/lightweight_test_fail8.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
 
 template<class T1, class T2> struct Y1
 {
diff --git a/test/lightweight_test_test.cpp b/test/lightweight_test_test.cpp
index 8fae051..a5193f2 100644
--- a/test/lightweight_test_test.cpp
+++ b/test/lightweight_test_test.cpp
@@ -32,26 +32,6 @@ void f( bool x )
     }
 }
 
-template<class T1, class T2> struct Y1
-{
-    enum { value = 1 };
-};
-
-template<class T1, class T2> struct Y2
-{
-    enum { value = 0 };
-};
-
-struct X1
-{
-    typedef int type;
-};
-
-struct X2
-{
-    typedef int type;
-};
-
 int main()
 {
     int x = 0;
@@ -88,13 +68,5 @@ int main()
     BOOST_TEST_THROWS( f(true), X );
     BOOST_TEST_THROWS( f(false), int );
 
-    // BOOST_TEST_TRAIT_TRUE
-
-    BOOST_TEST_TRAIT_TRUE(( Y1<X1::type, X2::type> ));
-
-    // BOOST_TEST_TRAIT_FALSE
-
-    BOOST_TEST_TRAIT_FALSE(( Y2<X1::type, X2::type> ));
-
     return boost::report_errors();
 }
diff --git a/test/lightweight_test_test2.cpp b/test/lightweight_test_test2.cpp
new file mode 100644
index 0000000..c60fecc
--- /dev/null
+++ b/test/lightweight_test_test2.cpp
@@ -0,0 +1,44 @@
+//
+// Test for lightweight_test_trait.hpp
+//
+// Copyright (c) 2014 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+
+#include <boost/core/lightweight_test_trait.hpp>
+
+template<class T1, class T2> struct Y1
+{
+    enum { value = 1 };
+};
+
+template<class T1, class T2> struct Y2
+{
+    enum { value = 0 };
+};
+
+struct X1
+{
+    typedef int type;
+};
+
+struct X2
+{
+    typedef int type;
+};
+
+int main()
+{
+    // BOOST_TEST_TRAIT_TRUE
+
+    BOOST_TEST_TRAIT_TRUE(( Y1<X1::type, X2::type> ));
+
+    // BOOST_TEST_TRAIT_FALSE
+
+    BOOST_TEST_TRAIT_FALSE(( Y2<X1::type, X2::type> ));
+
+    return boost::report_errors();
+}