diff --git a/etc/functional_tests.conf b/etc/functional_tests.conf
index 304538ac..7fef2af4 100644
--- a/etc/functional_tests.conf
+++ b/etc/functional_tests.conf
@@ -8,7 +8,7 @@ username=barbican
 password=orange
 project_name=service
 project_id=service
-max_payload_size=10000
+#max_payload_size=10000
 project_domain_name=Default
 
 [identity]
diff --git a/functionaltests/client/__init__.py b/functionaltests/client/__init__.py
index 7453542c..a6e9b3ec 100644
--- a/functionaltests/client/__init__.py
+++ b/functionaltests/client/__init__.py
@@ -31,5 +31,6 @@ CONF.register_opt(cfg.StrOpt('username'), group='keymanager')
 CONF.register_opt(cfg.StrOpt('password'), group='keymanager')
 CONF.register_opt(cfg.StrOpt('project_name'), group='keymanager')
 CONF.register_opt(cfg.StrOpt('project_id'), group='keymanager')
-CONF.register_opt(cfg.IntOpt('max_payload_size'), group='keymanager')
+CONF.register_opt(cfg.IntOpt('max_payload_size', default=10000),
+                             group='keymanager')
 CONF.register_opt(cfg.StrOpt('project_domain_name'), group='keymanager')