diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index 52ed789b6e..68f0b691ba 100644
--- a/etc/glance-api.conf
+++ b/etc/glance-api.conf
@@ -62,7 +62,7 @@ sql_idle_timeout = 3600
 # may improve performance (especially if using SSL with
 # compression turned on). It is typically recommended to set
 # this value to the number of CPUs present on your machine.
-workers = 0
+workers = 1
 
 # Role used to identify an authenticated user as administrator
 #admin_role = admin
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
index d3b416c85e..90f4b1a13e 100644
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@@ -58,7 +58,7 @@ socket_opts = [
     cfg.StrOpt('key_file'),
 ]
 
-workers_opt = cfg.IntOpt('workers', default=0)
+workers_opt = cfg.IntOpt('workers', default=1)
 
 CONF = cfg.CONF
 CONF.register_opts(bind_opts)
diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py
index c0e062303c..c95c8e5b01 100644
--- a/glance/tests/functional/__init__.py
+++ b/glance/tests/functional/__init__.py
@@ -364,6 +364,7 @@ class RegistryServer(Server):
         self.log_file = os.path.join(self.test_dir, "registry.log")
         self.owner_is_tenant = True
         self.server_control_options = '--capture-output'
+        self.workers = 0
         self.conf_base = """[DEFAULT]
 verbose = %(verbose)s
 debug = %(debug)s
@@ -376,6 +377,7 @@ sql_idle_timeout = 3600
 api_limit_max = 1000
 limit_param_default = 25
 owner_is_tenant = %(owner_is_tenant)s
+workers = %(workers)s
 [paste_deploy]
 flavor = %(deployment_flavor)s
 """