diff --git a/postgres-appliance/bootstrap/maybe_pg_upgrade.py b/postgres-appliance/bootstrap/maybe_pg_upgrade.py
index b3d08e02e..d19d8b451 100644
--- a/postgres-appliance/bootstrap/maybe_pg_upgrade.py
+++ b/postgres-appliance/bootstrap/maybe_pg_upgrade.py
@@ -11,7 +11,7 @@
 def tail_postgres_log(weekday):
     logdir = os.environ.get('PGLOG', '/home/postgres/pgdata/pgroot/pg_log')
     logfile = os.path.join(logdir, 'postgresql-{0}.csv'.format(weekday))
-    return subprocess.check_output(['tail', '-n5', logfile]).decode('utf-8')
+    return subprocess.check_output(['tail', '-n35', logfile]).decode('utf-8')
 
 
 def tail_postgres_logs():
diff --git a/postgres-appliance/tests/test_spilo.sh b/postgres-appliance/tests/test_spilo.sh
index ffa440af9..024370ed2 100644
--- a/postgres-appliance/tests/test_spilo.sh
+++ b/postgres-appliance/tests/test_spilo.sh
@@ -301,6 +301,7 @@ function test_spilo() {
     drop_table_with_oids "$container"
 
     log_info "[TS1] Testing in-place major upgrade 11->12"
+    wait_zero_lag "$container"
     run_test test_successful_inplace_upgrade_to_12 "$container"
     wait_all_streaming "$container"
     run_test test_envdir_updated_to_x 12