diff --git a/test/test-organization-ts/test-tree-management-test.cpp b/test/test-organization-ts/test-tree-management-test.cpp
index bf8e5f64..4a85dab0 100644
--- a/test/test-organization-ts/test-tree-management-test.cpp
+++ b/test/test-organization-ts/test-tree-management-test.cpp
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE( manual_test_case_creation_test )
     BOOST_TEST( tc1->p_id != INV_TEST_UNIT_ID );
 
     BOOST_TEST( tc1->p_expected_failures == 0U );
-    BOOST_TEST( tc1->p_timeout == -1 );
+    BOOST_TEST( tc1->p_timeout == 0 );
     BOOST_TEST( tc1->p_name == const_string( "empty_" ) );
     BOOST_TEST( tc1->p_test_func );
     BOOST_TEST( tc1->p_default_status == test_unit::RS_INHERIT );
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE( manual_test_case_creation_test )
     BOOST_CHECK_THROW( framework::get( tc1->p_id, TUT_SUITE ), framework::internal_error );
 
     test_case* tc2 = make_test_case( &empty_, "my test case", "test_file_name", 1 );
-    BOOST_TEST( tc2->p_name == const_string( "my test case" ) );
+    BOOST_TEST( tc2->p_name == const_string( "my_test_case" ) );
     BOOST_TEST( tc2->p_file_name == const_string( "test_file_name" ) );
     BOOST_TEST( tc2->p_line_num == 1U );
 }
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE( manual_test_suite_creation )
     BOOST_TEST( ts1->p_line_num == 138U );
 
     BOOST_TEST( ts1->p_expected_failures == 0U );
-    BOOST_TEST( ts1->p_timeout == -1 );
+    BOOST_TEST( ts1->p_timeout == 0 );
     BOOST_TEST( ts1->p_name == const_string( "TestSuite" ) );
     BOOST_TEST( ts1->p_default_status == test_unit::RS_INHERIT );
     BOOST_TEST( ts1->p_run_status == test_unit::RS_INVALID );
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE( manual_test_unit_registration )
     BOOST_TEST( ts1->size() == 2U );
 
     BOOST_TEST( tc2->p_expected_failures == 2U );
-    BOOST_TEST( tc2->p_timeout == -1 );
+    BOOST_TEST( tc2->p_timeout == 0 );
     BOOST_TEST( ts1->p_expected_failures == 3U );
 
     test_suite* ts2 = BOOST_TEST_SUITE( "TestSuite2" );