diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 22449141f..597629820 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -1219,16 +1219,7 @@ g_test_log (GTestLogType lbit,
           while ((line = strchr (line, '\n')))
               *(line++) = ' ';
 
-          if (is_subtest ())
-            {
-              g_test_tap_print (subtest_level, FALSE, "Bail out! %s\n", message);
-              g_test_tap_print (0, FALSE, "Bail out!\n");
-            }
-          else
-            {
-              g_test_tap_print (0, FALSE, "Bail out! %s\n", message);
-            }
-
+          g_test_tap_print (subtest_level, FALSE, "Bail out! %s\n", message);
           g_free (message);
         }
       else if (g_test_verbose ())
diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index e0653857d..3f335b4ac 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -2722,8 +2722,7 @@ test_tap_subtest_error (void)
 
   g_assert_cmpstr (interesting_lines, ==,
                    TAP_SUBTEST_PREFIX "Bail out! GLib-FATAL-ERROR: This should error out "
-                   "Because it's just wrong!\n"
-                   "Bail out!\n");
+                   "Because it's just wrong!\n");
 
   g_free (output);
   g_ptr_array_unref (argv);
@@ -2815,8 +2814,7 @@ test_tap_subtest_error_and_pass (void)
 
   g_assert_cmpstr (interesting_lines, ==,
                    TAP_SUBTEST_PREFIX "Bail out! GLib-FATAL-ERROR: This should error out "
-                   "Because it's just wrong!\n"
-                   "Bail out!\n");
+                   "Because it's just wrong!\n");
 
   g_free (output);
   g_ptr_array_unref (argv);