--- a/headers.t
+++ b/headers.t
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # (C) Sergey Kandaurov
+# (C) Maxim Dounin
 # (C) Nginx, Inc.
 
 # Tests for headers module.
@@ -41,7 +42,7 @@ http {
 
         add_header   X-URI $uri;
         add_header   X-Always $uri always;
-        expires epoch;
+        expires      epoch;
 
         location /t1 {
         }
@@ -63,6 +64,10 @@ http {
 
         location /access {
             expires 2048;
+
+            location /access_inner {
+                # inherited from outer
+            }
         }
 
         location /negative {
@@ -76,6 +81,18 @@ http {
         location /modified {
             expires modified 2048;
         }
+
+        location /var {
+            expires $arg_e;
+
+            location /var_inner {
+                # inherited from outer
+            }
+
+            location /var_modified {
+                expires modified $arg_e;
+            }
+        }
     }
 }
 
@@ -86,11 +103,15 @@ EOF
 $t->write_file('max', '');
 $t->write_file('off', '');
 $t->write_file('access', '');
+$t->write_file('access_inner', '');
 $t->write_file('negative', '');
 $t->write_file('daily', '');
 $t->write_file('modified', '');
+$t->write_file('var', '');
+$t->write_file('var_inner', '');
+$t->write_file('var_modified', '');
 
-$t->try_run('no add_header always')->plan(13);
+$t->try_run('no add_header always or expires with variable')->plan(25);
 
 ###############################################################################
 
@@ -114,8 +135,28 @@ like(http_get('/epoch'), qr/Expires:.*19
 like(http_get('/max'), qr/Expires:.*2037/, 'expires max');
 unlike(http_get('/off'), qr/Expires:/, 'expires off');
 like(http_get('/access'), qr/max-age=2048/, 'expires access');
+like(http_get('/access_inner'), qr/max-age=2048/, 'expires inner');
 like(http_get('/negative'), qr/no-cache/, 'expires negative');
 like(http_get('/daily'), qr/Expires:.*:33 GMT/, 'expires daily');
 like(http_get('/modified'), qr/max-age=204./, 'expires modified');
 
+# expires with variables
+
+like(http_get('/var?e=epoch'), qr/Expires:.*1970/, 'expires var epoch');
+like(http_get('/var?e=max'), qr/Expires:.*2037/, 'expires var max');
+unlike(http_get('/var?e=off'), qr/Expires:/, 'expires var off');
+like(http_get('/var?e=2048'), qr/max-age=2048/, 'expires var access');
+like(http_get('/var_inner?e=2048'), qr/max-age=2048/, 'expires var inner');
+like(http_get('/var?e=-2048'), qr/no-cache/, 'expires var negative');
+like(http_get('/var?e=@33s'), qr/Expires:.*:33 GMT/, 'expires var daily');
+like(http_get('/var_modified?e=2048'), qr/max-age=204./,
+	'expires var modified');
+
+# some invalid cases
+
+unlike(http_get('/var'), qr/Expires/, 'expires var empty');
+unlike(http_get('/var?e=bad'), qr/Expires/, 'expires var bad');
+unlike(http_get('/var_modified?e=epoch'), qr/Expires/,
+	'expires var modified epoch');
+
 ###############################################################################