diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 1fe4078..df9619d 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -60,7 +60,6 @@ import testing ;
           [ run sp_recursive_assign2_test.cpp ]
           [ run sp_recursive_assign_rv_test.cpp ]
           [ run sp_recursive_assign2_rv_test.cpp ]
-          [ run esft_constructor_test.cpp ]
           [ run enable_shared_from_raw_test.cpp ]
           [ compile-fail auto_ptr_lv_fail.cpp ]
           [ run atomic_count_test2.cpp ]
@@ -168,5 +167,6 @@ import testing ;
           [ run shared_from_raw_test2.cpp ]
           [ run shared_from_raw_test3.cpp ]
           [ run shared_from_raw_test4.cpp ]
+          [ run shared_from_raw_test5.cpp ]
         ;
 }
diff --git a/test/esft_constructor_test.cpp b/test/shared_from_raw_test5.cpp
similarity index 94%
rename from test/esft_constructor_test.cpp
rename to test/shared_from_raw_test5.cpp
index 32a25b5..fcf4e81 100644
--- a/test/esft_constructor_test.cpp
+++ b/test/shared_from_raw_test5.cpp
@@ -1,9 +1,9 @@
 //
-//  esft_constructor_test.cpp
+//  shared_from_raw_test5.cpp - was esft_constructor_test.cpp
 //
-//  A test for the new enable_shared_from_this support for calling
-//  shared_from_this from constructors (that is, prior to the
-//  object's ownership being passed to an external shared_ptr).
+//  A test for calling shared_from_raw from constructors
+//  (that is, prior to the object's ownership being passed to
+//  an external shared_ptr).
 //
 //  Copyright (c) 2008 Frank Mori Hess
 //  Copyright (c) 2008 Peter Dimov
@@ -13,6 +13,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
+
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>