diff --git a/cinder/wsgi.py b/cinder/wsgi.py
index 20143783af2..f7d10f55959 100644
--- a/cinder/wsgi.py
+++ b/cinder/wsgi.py
@@ -69,6 +69,9 @@ CONF.register_opts(socket_opts)
 
 LOG = logging.getLogger(__name__)
 
+# Raise the default from 8192 to accommodate large tokens
+eventlet.wsgi.MAX_HEADER_LINE = 16384
+
 
 class Server(object):
     """Server class to manage a WSGI server, serving a WSGI application."""