diff --git a/test/expected/test_utils.out b/test/expected/test_utils.out
index f7242d667..23806aa18 100644
--- a/test/expected/test_utils.out
+++ b/test/expected/test_utils.out
@@ -15,13 +15,13 @@ SET ROLE :ROLE_DEFAULT_PERM_USER;
 -- failing conditions
 \set ON_ERROR_STOP 0
 SELECT test.condition();
-ERROR:  TestFailure @ test_utils.c ts_test_utils_condition:30 | (true_value == false_value)
+ERROR:  TestFailure | (true_value == false_value)
 SELECT test.int64_eq();
-ERROR:  TestFailure @ test_utils.c ts_test_utils_int64_eq:40 | (big == small) [32532978 == 3242234]
+ERROR:  TestFailure | (big == small) [32532978 == 3242234]
 SELECT test.ptr_eq();
-ERROR:  TestFailure @ test_utils.c ts_test_utils_ptr_eq:54 | (true_ptr == false_ptr)
+ERROR:  TestFailure | (true_ptr == false_ptr)
 SELECT test.double_eq();
-ERROR:  TestFailure @ test_utils.c ts_test_utils_double_eq:65 | (big_double == small_double) [923423478.324200 == 324.300000]
+ERROR:  TestFailure | (big_double == small_double) [923423478.324200 == 324.300000]
 \set ON_ERROR_STOP 1
 -- Test debug points
 --
diff --git a/test/src/test_utils.h b/test/src/test_utils.h
index bab7ca957..da03f666d 100644
--- a/test/src/test_utils.h
+++ b/test/src/test_utils.h
@@ -30,12 +30,7 @@ strip_path(const char *filename)
 #define TestFailure(fmt, ...)                                                                      \
 	do                                                                                             \
 	{                                                                                              \
-		elog(ERROR,                                                                                \
-			 "TestFailure @ %s %s:%d | " fmt "",                                                   \
-			 strip_path(__FILE__),                                                                 \
-			 __func__,                                                                             \
-			 __LINE__,                                                                             \
-			 ##__VA_ARGS__);                                                                       \
+		elog(ERROR, "TestFailure | " fmt "", ##__VA_ARGS__);                                       \
 		pg_unreachable();                                                                          \
 	} while (0)
 
@@ -86,7 +81,7 @@ strip_path(const char *filename)
 		MemoryContextSwitchTo(oldctx);                                                             \
 		if (!this_has_panicked)                                                                    \
 		{                                                                                          \
-			elog(ERROR, "failed to panic @ line %d", __LINE__);                                    \
+			elog(ERROR, "failed to panic");                                                        \
 		}                                                                                          \
 	} while (0)
 
diff --git a/tsl/test/expected/remote_connection.out b/tsl/test/expected/remote_connection.out
index 055c39fc8..45828658d 100644
--- a/tsl/test/expected/remote_connection.out
+++ b/tsl/test/expected/remote_connection.out
@@ -45,6 +45,7 @@ INSERT INTO "S 1"."T 1"
 -- ===================================================================
 -- run tests
 -- ===================================================================
+\set VERBOSITY verbose
 SELECT * FROM test.get_connection_stats();
  connections_created | connections_closed | results_created | results_cleared 
 ---------------------+--------------------+-----------------+-----------------
@@ -53,7 +54,8 @@ SELECT * FROM test.get_connection_stats();
 
 \set ON_ERROR_STOP 0
 SELECT test.send_remote_query_that_generates_exception();
-ERROR:  bad query error thrown from test
+ERROR:  XX000: bad query error thrown from test
+LOCATION:  ts_test_bad_remote_query, connection.c:184
 \set ON_ERROR_STOP 1
 SELECT * FROM test.get_connection_stats();
  connections_created | connections_closed | results_created | results_cleared 
diff --git a/tsl/test/sql/remote_connection.sql b/tsl/test/sql/remote_connection.sql
index f21706b06..01c2eb792 100644
--- a/tsl/test/sql/remote_connection.sql
+++ b/tsl/test/sql/remote_connection.sql
@@ -56,6 +56,7 @@ INSERT INTO "S 1"."T 1"
 -- run tests
 -- ===================================================================
 
+\set VERBOSITY verbose
 SELECT * FROM test.get_connection_stats();
 \set ON_ERROR_STOP 0
 SELECT test.send_remote_query_that_generates_exception();