diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 1ae0f3fc41..e9e70eb3a2 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -15,22 +15,22 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "nginx 1.29.8 + OpenSSL"
-            NGINX_VERSION: "1.29.8"
+          - name: "nginx 1.31.0 + OpenSSL"
+            NGINX_VERSION: "1.31.0"
             TEST_NGINX_TIMEOUT: "5"
 
-          - name: "nginx 1.29.8 + OpenSSL + HTTP/2"
-            NGINX_VERSION: "1.29.8"
+          - name: "nginx 1.31.0 + OpenSSL + HTTP/2"
+            NGINX_VERSION: "1.31.0"
             TEST_NGINX_TIMEOUT: "5"
             TEST_NGINX_USE_HTTP2: "1"
 
-          - name: "nginx 1.29.8 + OpenSSL + HTTP/3"
-            NGINX_VERSION: "1.29.8"
+          - name: "nginx 1.31.0 + OpenSSL + HTTP/3"
+            NGINX_VERSION: "1.31.0"
             TEST_NGINX_USE_HTTP3: "1"
             TEST_NGINX_QUIC_IDLE_TIMEOUT: "3"
 
-          - name: "nginx 1.29.8 + BoringSSL + HTTP/3"
-            NGINX_VERSION: "1.29.8"
+          - name: "nginx 1.31.0 + BoringSSL + HTTP/3"
+            NGINX_VERSION: "1.31.0"
             BORINGSSL: "1"
             TEST_NGINX_USE_HTTP3: "1"
             TEST_NGINX_QUIC_IDLE_TIMEOUT: "3"
diff --git a/t/023-rewrite/socket-keepalive.t b/t/023-rewrite/socket-keepalive.t
index 9ce8d5e290..c958d876f1 100644
--- a/t/023-rewrite/socket-keepalive.t
+++ b/t/023-rewrite/socket-keepalive.t
@@ -792,6 +792,7 @@ qr/lua tcp socket connection pool size: 25\b/]
     }
 
     location /foo {
+        keepalive_timeout 60s;
         echo foo;
     }
 
diff --git a/t/138-balancer.t b/t/138-balancer.t
index 105743a679..7d15c43aa2 100644
--- a/t/138-balancer.t
+++ b/t/138-balancer.t
@@ -735,7 +735,7 @@ GET /t
 --- response_body eval
 qr/502 Bad Gateway/
 --- no_error_log
-[error]
+[crit]
 --- error_log eval
-qr/SSL_do_handshake.*(?:no application protocol|NO_APPLICATION_PROTOCOL).*SSL alert number 120\) while SSL handshaking to upstream/
+qr/SSL_do_handshake.*(?:no application protocol|NO_APPLICATION_PROTOCOL).*alert number 120\) while SSL handshaking to upstream/
 --- skip_nginx: 4: < 1.29.4