--- a/proxy_protocol2.t
+++ b/proxy_protocol2.t
@@ -24,7 +24,7 @@ select STDOUT; $| = 1;
 
 my $t = Test::Nginx->new()->has(qw/http access realip/);
 
-$t->write_file_expand('nginx.conf', <<'EOF')->plan(28);
+$t->write_file_expand('nginx.conf', <<'EOF')->plan(32);
 
 %%TEST_GLOBALS%%
 
@@ -41,6 +41,9 @@ http {
     add_header X-IP $remote_addr!$remote_port;
     add_header X-PP $proxy_protocol_addr!$proxy_protocol_port;
     add_header X-PPS $proxy_protocol_server_addr!$proxy_protocol_server_port;
+    add_header X-TL $proxy_protocol_tlv_0x3-$proxy_protocol_tlv_0x0000ae-$proxy_protocol_tlv_0x0f;
+    add_header X-NT $proxy_protocol_tlv_unique_id-$proxy_protocol_tlv_ssl_cn-$proxy_protocol_tlv_ssl_0x22-$proxy_protocol_tlv_ssl_verify;
+    add_header X-NT2 $proxy_protocol_tlv_unique_id-$proxy_protocol_tlv_ssl_version-$proxy_protocol_tlv_ssl_0x21-$proxy_protocol_tlv_ssl_verify;
 
     server {
         listen       127.0.0.1:8080 proxy_protocol;
@@ -78,8 +81,14 @@ my $p = pack("N3C", 0x0D0A0D0A, 0x000D0A
 my $tcp4 = $p . pack("CnN2n2", 0x11, 12, 0xc0000201, 0xc0000202, 123, 5678);
 my $tcp6 = $p . pack("CnNx8NNx8Nn2", 0x21, 36,
 	0x20010db8, 0x00000001, 0x20010db8, 0x00000002, 123, 5678);
-my $tlv = $p . pack("CnN2n2x9", 0x11, 21, 0xc0000201, 0xc0000202, 123, 5678);
 my $unk1 = $p . pack("Cxx", 0x01);
+my $tlv = $p . pack("CnN2n2N3", 0x11, 24, 0xc0000201, 0xc0000202, 123, 5678,
+	0x03000141, 0xAE000531, 0x32333435);
+my $tlv2 = $p . pack("CnN2n2N7", 0x11, 40, 0xc0000201, 0xc0000202, 123, 5678,
+	0x05000555, 0x4E495151,0x20001100, 0xdeadbeef, 0x22000966, 0x6f6f2e62,
+	0x61727272);
+my $tlv3 = $p . pack("CnN2n2N5", 0x11, 32, 0xc0000201, 0xc0000202, 123, 5678,
+	0x05000555, 0x4E495151,0x20000900, 0x00000000, 0x23000132);
 my $unk2 = $p . pack("CnC4", 0x41, 4, 1, 2, 3, 4);
 my $r;
 
@@ -102,6 +111,16 @@ like($r, qr/SEE-THIS/, 'tlv request');
 like($r, qr/X-PP: 192.0.2.1!123\x0d/, 'tlv proxy');
 like($r, qr/X-PPS: 192.0.2.2!5678\x0d/, 'tlv proxy server');
 unlike($r, qr/X-IP: (192.0.2.1|[^!]+!123\x0d)/, 'tlv client');
+like($r, qr/X-TL: A-12345-\x0d/, 'tlv raw variables');
+like($r, qr/X-NT: ---\x0d/, 'tlv missing variables');
+
+$r = pp_get('/t1', $tlv2);
+like($r, qr/X-NT: UNIQQ-foo.barrr-foo.barrr-3735928559\x0d/,
+	'tlv named variables');
+
+$r = pp_get('/t1', $tlv3);
+like($r, qr/X-NT2: UNIQQ-2-2-0\x0d/,
+	'tlv named variables');
 
 $r = pp_get('/t1', $unk1);
 like($r, qr/SEE-THIS/, 'unknown request 1');