diff --git a/upstream_keepalive.t b/upstream_keepalive.t
new file mode 100644
index 0000000..848c836
--- /dev/null
+++ b/upstream_keepalive.t
@@ -0,0 +1,93 @@
+#!/usr/bin/perl
+
+# (C) Sergey Kandaurov
+# (C) Nginx, Inc.
+
+# Tests for upstream keepalive, keepalive_requests and keepalive_timeout.
+
+###############################################################################
+
+use warnings;
+use strict;
+
+use Test::More;
+
+BEGIN { use FindBin; chdir($FindBin::Bin); }
+
+use lib 'lib';
+use Test::Nginx;
+
+###############################################################################
+
+select STDERR; $| = 1;
+select STDOUT; $| = 1;
+
+my $t = Test::Nginx->new()->has(qw/http proxy upstream_keepalive/)
+	->write_file_expand('nginx.conf', <<'EOF');
+
+%%TEST_GLOBALS%%
+
+daemon off;
+
+events {
+}
+
+http {
+    %%TEST_GLOBALS_HTTP%%
+
+    upstream backend {
+        server 127.0.0.1:8081;
+        keepalive 1;
+        keepalive_requests 3;
+        keepalive_timeout 2s;
+    }
+
+    server {
+        listen       127.0.0.1:8080;
+        server_name  localhost;
+
+        proxy_http_version 1.1;
+        proxy_set_header Connection $args;
+
+        location / {
+            proxy_pass http://backend;
+        }
+    }
+
+    server {
+        listen       127.0.0.1:8081;
+        server_name  localhost;
+
+        location / {
+            add_header X-Connection $connection;
+        }
+    }
+}
+
+EOF
+
+$t->write_file('index.html', 'SEE-THIS');
+$t->try_run('no keepalive_requests')->plan(7);
+
+###############################################################################
+
+my ($r, $n);
+
+# keepalive_requests
+
+like($r = http_get('/'), qr/SEE-THIS/, 'request');
+$r =~ m/X-Connection: (\d+)/; $n = $1;
+like(http_get('/'), qr/X-Connection: $n.*SEE/ms, 'keepalive');
+like(http_get('/'), qr/X-Connection: $n.*SEE/ms, 'keepalive again');
+like(http_get('/'), qr/X-Connection: (?!$n).*SEE/ms, 'keepalive requests');
+http_get('/?close');
+
+# keepalive_timeout
+
+like($r = http_get('/'), qr/SEE-THIS/, 'request timer');
+$r =~ m/X-Connection: (\d+)/; $n = $1;
+like(http_get('/'), qr/X-Connection: $n.*SEE/ms, 'keepalive timer');
+select undef, undef, undef, 2.5;
+like(http_get('/'), qr/X-Connection: (?!$n).*SEE/ms, 'keepalive timeout');
+
+###############################################################################