diff --git a/t/024-access/on-abort.t b/t/024-access/on-abort.t
index 70637ba862..a013d90998 100644
--- a/t/024-access/on-abort.t
+++ b/t/024-access/on-abort.t
@@ -372,7 +372,7 @@ delete thread 1
 $
 --- timeout: 0.2
 --- abort
---- wait: 0.2
+--- wait: 1
 --- ignore_response
 --- no_error_log
 [error]
diff --git a/t/124-init-worker.t b/t/124-init-worker.t
index c68d74bb18..adb1f91b80 100644
--- a/t/124-init-worker.t
+++ b/t/124-init-worker.t
@@ -784,24 +784,23 @@ ok
     GET /t
 --- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
 --- grep_error_log_out eval
-qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \1
-lua close the global Lua VM \1 in the cache helper process \d+
-lua close the global Lua VM \1
-|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \2 in the cache helper process \d+
-lua close the global Lua VM \2
-lua close the global Lua VM \2
-|lua close the global Lua VM ([0-9A-F]+)
-lua close the global Lua VM \3 in the cache helper process \d+
-lua close the global Lua VM \3
-lua close the global Lua VM \3 in the cache helper process \d+
-|lua close the global Lua VM ([0-9A-F]+)
-lua close the global Lua VM \4 in the cache helper process \d+
-lua close the global Lua VM \4 in the cache helper process \d+
-lua close the global Lua VM \4
-)(?:lua close the global Lua VM [0-9A-F]+
-)*\z/
+do {
+    my $close  = qr/lua close the global Lua VM /;
+    my $helper = qr/${close}[0-9A-F]+ in the cache helper process \d+\n/;
+    my $plain  = qr/${close}[0-9A-F]+\n/;
+    my $suffix = qr/ in the cache helper process \d+/;
+    my $skip   = qr/(?:[^\n]*\n)*?/;
+
+    qr/
+        \A
+        (?= $skip $helper $skip $helper )                # at least 2 helper lines
+        (?! $skip $helper $skip $helper $skip $helper )  # but not a 3rd one
+        (?= $skip $plain  $skip $plain  )                # at least 2 plain lines
+        $close ([0-9A-F]+) (?:$suffix)? \n               # 1st line pins the VM address
+        (?: $close \1 (?:$suffix)? \n )*                 # later lines: same address
+        \z
+    /x;
+}
 --- no_error_log
 [error]
 start privileged agent process
@@ -830,25 +829,23 @@ start privileged agent process
     GET /t
 --- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
 --- grep_error_log_out eval
-qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \1
-lua close the global Lua VM \1 in the cache helper process \d+
-lua close the global Lua VM \1
-|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \2 in the cache helper process \d+
-lua close the global Lua VM \2
-lua close the global Lua VM \2
-|lua close the global Lua VM ([0-9A-F]+)
-lua close the global Lua VM \3 in the cache helper process \d+
-lua close the global Lua VM \3
-lua close the global Lua VM \3 in the cache helper process \d+
-)(?:lua close the global Lua VM [0-9A-F]+
-|lua close the global Lua VM ([0-9A-F]+)
-lua close the global Lua VM \4 in the cache helper process \d+
-lua close the global Lua VM \4 in the cache helper process \d+
-lua close the global Lua VM \4 
-lua close the global Lua VM \4
-)*\z/
+do {
+    my $close  = qr/lua close the global Lua VM /;
+    my $helper = qr/${close}[0-9A-F]+ in the cache helper process \d+\n/;
+    my $plain  = qr/${close}[0-9A-F]+\n/;
+    my $suffix = qr/ in the cache helper process \d+/;
+    my $skip   = qr/(?:[^\n]*\n)*?/;
+
+    qr/
+        \A
+        (?= $skip $helper $skip $helper )                # at least 2 helper lines
+        (?! $skip $helper $skip $helper $skip $helper )  # but not a 3rd one
+        (?= $skip $plain  $skip $plain  )                # at least 2 plain lines
+        $close ([0-9A-F]+) (?:$suffix)? \n               # 1st line pins the VM address
+        (?: $close \1 (?:$suffix)? \n )*                 # later lines: same address
+        \z
+    /x;
+}
 --- no_error_log
 [error]
 start privileged agent process
@@ -878,24 +875,23 @@ start privileged agent process
     GET /t
 --- grep_error_log eval: qr/lua close the global Lua VM \S+ in the cache helper process \d+|lua close the global Lua VM \S+$/
 --- grep_error_log_out eval
-qr/\A(?:lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \1
-lua close the global Lua VM \1 in the cache helper process \d+
-lua close the global Lua VM \1
-|lua close the global Lua VM ([0-9A-F]+) in the cache helper process \d+
-lua close the global Lua VM \2 in the cache helper process \d+
-lua close the global Lua VM \2
-lua close the global Lua VM \2
-|lua close the global Lua VM ([0-9A-F]+)
-lua close the global Lua VM \3 in the cache helper process \d+
-lua close the global Lua VM \3
-lua close the global Lua VM \3 in the cache helper process \d+
-|lua close the global Lua VM ([0-9A-F]+)
-lua close the global Lua VM \4 in the cache helper process \d+
-lua close the global Lua VM \4 in the cache helper process \d+
-lua close the global Lua VM \4
-)(?:lua close the global Lua VM [0-9A-F]+
-)*\z/
+do {
+    my $close  = qr/lua close the global Lua VM /;
+    my $helper = qr/${close}[0-9A-F]+ in the cache helper process \d+\n/;
+    my $plain  = qr/${close}[0-9A-F]+\n/;
+    my $suffix = qr/ in the cache helper process \d+/;
+    my $skip   = qr/(?:[^\n]*\n)*?/;
+
+    qr/
+        \A
+        (?= $skip $helper $skip $helper )                # at least 2 helper lines
+        (?! $skip $helper $skip $helper $skip $helper )  # but not a 3rd one
+        (?= $skip $plain  $skip $plain  )                # at least 2 plain lines
+        $close ([0-9A-F]+) (?:$suffix)? \n               # 1st line pins the VM address
+        (?: $close \1 (?:$suffix)? \n )*                 # later lines: same address
+        \z
+    /x;
+}
 --- error_log eval
 qr/start privileged agent process \d+/
 --- no_error_log
diff --git a/t/128-duplex-tcp-socket.t b/t/128-duplex-tcp-socket.t
index 511cc20bfc..268ec79cda 100644
--- a/t/128-duplex-tcp-socket.t
+++ b/t/128-duplex-tcp-socket.t
@@ -355,7 +355,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) {
 --- tcp_query_len: 11
 --- no_error_log
 [error]
---- wait: 0.05
+--- wait: 0.5
 
 
 
diff --git a/t/189-http2-subreq-error-wakeup.t b/t/189-http2-subreq-error-wakeup.t
index 2b6adb6e19..553b806b74 100644
--- a/t/189-http2-subreq-error-wakeup.t
+++ b/t/189-http2-subreq-error-wakeup.t
@@ -46,6 +46,7 @@ __DATA__
 --- http2
 --- request
 GET /delay
+--- curl_options: --max-time=0.9
 --- timeout: 1
 --- abort
 --- ignore_response
@@ -100,6 +101,7 @@ Parent request finished, got response from subrequest
 --- http2
 --- request
 GET /outer
+--- curl_options: --max-time=0.9
 --- timeout: 1
 --- abort
 --- ignore_response
@@ -160,6 +162,7 @@ Outer request completed
 --- http2
 --- request
 GET /parallel
+--- curl_options: --max-time=0.9
 --- timeout: 1
 --- abort
 --- ignore_response