diff -r 70b21cf8b45c -r e35d23686d1f web/test/unittest_views_staticcontrollers.py
--- a/web/test/unittest_views_staticcontrollers.py	Fri Nov 20 18:23:17 2015 +0100
+++ b/web/test/unittest_views_staticcontrollers.py	Fri Nov 20 18:17:08 2015 +0100
@@ -70,6 +70,9 @@
         with self._publish_static_files(fname) as req:
             self.assertEqual(200, req.status_out)
             self.assertIn('last-modified', req.headers_out)
+            self.assertIn('expires', req.headers_out)
+            self.assertEqual(req.get_response_header('cache-control'),
+                             {'max-age': 604800})
         next_headers = {
             'if-modified-since': req.get_response_header('last-modified', raw=True),
         }