diff --git a/test/source_location_test.cpp b/test/source_location_test.cpp
index 265984b..9373fa4 100644
--- a/test/source_location_test.cpp
+++ b/test/source_location_test.cpp
@@ -17,20 +17,20 @@ int main()
     }
 
     {
-        boost::source_location loc( __FILE__, __LINE__, "main" );
+        boost::source_location loc( __FILE__, __LINE__, "main()" );
 
         BOOST_TEST_CSTR_EQ( loc.file_name(), __FILE__ );
         BOOST_TEST_EQ( loc.line(), 20 );
-        BOOST_TEST_CSTR_EQ( loc.function_name(), "main" );
+        BOOST_TEST_CSTR_EQ( loc.function_name(), "main()" );
         BOOST_TEST_EQ( loc.column(), 0 );
     }
 
     {
-        boost::source_location loc( "file", 1, "main", 2 );
+        boost::source_location loc( "file", 1, "main()", 2 );
 
         BOOST_TEST_CSTR_EQ( loc.file_name(), "file" );
         BOOST_TEST_EQ( loc.line(), 1 );
-        BOOST_TEST_CSTR_EQ( loc.function_name(), "main" );
+        BOOST_TEST_CSTR_EQ( loc.function_name(), "main()" );
         BOOST_TEST_EQ( loc.column(), 2 );
     }
 
diff --git a/test/source_location_test3.cpp b/test/source_location_test3.cpp
index 4e0bb86..6d01a4b 100644
--- a/test/source_location_test3.cpp
+++ b/test/source_location_test3.cpp
@@ -11,88 +11,63 @@ int main()
     {
         boost::source_location loc;
         BOOST_TEST_EQ( loc.to_string(), std::string( "(unknown source location)" ) );
-    }
-
-    {
-        boost::source_location loc;
 
         std::ostringstream os;
         os << loc;
 
-        BOOST_TEST_EQ( os.str(), std::string( "(unknown source location)" ) );
+        BOOST_TEST_EQ( os.str(), loc.to_string() );
     }
 
     {
         boost::source_location loc( "file", 5, "" );
         BOOST_TEST_EQ( loc.to_string(), std::string( "file:5" ) );
-    }
-
-    {
-        boost::source_location loc( "file", 5, "" );
 
         std::ostringstream os;
         os << loc;
 
-        BOOST_TEST_EQ( os.str(), std::string( "file:5" ) );
+        BOOST_TEST_EQ( os.str(), loc.to_string() );
     }
 
     {
-        boost::source_location loc( "file", 7, "main" );
-        BOOST_TEST_EQ( loc.to_string(), std::string( "file:7 in function 'main'" ) );
-    }
-
-    {
-        boost::source_location loc( "file", 7, "main" );
+        boost::source_location loc( "file", 7, "main()" );
+        BOOST_TEST_EQ( loc.to_string(), std::string( "file:7 in function 'main()'" ) );
 
         std::ostringstream os;
         os << loc;
 
-        BOOST_TEST_EQ( os.str(), std::string( "file:7 in function 'main'" ) );
+        BOOST_TEST_EQ( os.str(), loc.to_string() );
     }
 
     {
-        boost::source_location loc( "file", 11, "main", 13 );
-        BOOST_TEST_EQ( loc.to_string(), std::string( "file:11:13 in function 'main'" ) );
-    }
-
-    {
-        boost::source_location loc( "file", 11, "main", 13 );
+        boost::source_location loc( "file", 11, "main()", 13 );
+        BOOST_TEST_EQ( loc.to_string(), std::string( "file:11:13 in function 'main()'" ) );
 
         std::ostringstream os;
         os << loc;
 
-        BOOST_TEST_EQ( os.str(), std::string( "file:11:13 in function 'main'" ) );
+        BOOST_TEST_EQ( os.str(), loc.to_string() );
     }
 
     {
         boost::source_location loc( "file", 17, "", 19 );
         BOOST_TEST_EQ( loc.to_string(), std::string( "file:17:19" ) );
-    }
-
-    {
-        boost::source_location loc( "file", 17, "", 19 );
 
         std::ostringstream os;
         os << loc;
 
-        BOOST_TEST_EQ( os.str(), std::string( "file:17:19" ) );
+        BOOST_TEST_EQ( os.str(), loc.to_string() );
     }
 
     {
         boost::source_location loc = BOOST_CURRENT_LOCATION;
 
-        std::string prefix = std::string( __FILE__ ) + ":82";
+        std::string prefix = std::string( __FILE__ ) + ":62";
         BOOST_TEST_EQ( loc.to_string().substr( 0, prefix.size() ), prefix );
-    }
-
-    {
-        boost::source_location loc = BOOST_CURRENT_LOCATION;
 
         std::ostringstream os;
         os << loc;
 
-        std::string prefix = std::string( __FILE__ ) + ":89";
-        BOOST_TEST_EQ( os.str().substr( 0, prefix.size() ), prefix );
+        BOOST_TEST_EQ( os.str(), loc.to_string() );
     }
 
     return boost::report_errors();