diff --git a/glance_store/_drivers/swift/utils.py b/glance_store/_drivers/swift/utils.py
index 7ddbfb5a..bbd8a4c6 100644
--- a/glance_store/_drivers/swift/utils.py
+++ b/glance_store/_drivers/swift/utils.py
@@ -100,9 +100,9 @@ Related options:
 ]
 
 _config_defaults = {'user_domain_id': 'default',
-                    'user_domain_name': None,
+                    'user_domain_name': 'default',
                     'project_domain_id': 'default',
-                    'project_domain_name': None}
+                    'project_domain_name': 'default'}
 
 if sys.version_info >= (3, 2):
     CONFIG = configparser.ConfigParser(defaults=_config_defaults)
diff --git a/glance_store/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py
index 4355b38a..0081e2db 100644
--- a/glance_store/tests/unit/test_swift_store.py
+++ b/glance_store/tests/unit/test_swift_store.py
@@ -1400,8 +1400,8 @@ class TestStoreAuthV3(TestStoreAuthV1):
             auth_url=loc.store_location.swift_url + '/',
             username=username, password="key",
             project_name=tenant,
-            project_domain_id='default', project_domain_name=None,
-            user_domain_id='default', user_domain_name=None,)
+            project_domain_id='default', project_domain_name='default',
+            user_domain_id='default', user_domain_name='default',)
         mock_session.Session.assert_called_once_with(
             auth=mock_identity.V3Password(), verify=True)
         mock_client.Client.assert_called_once_with(
diff --git a/glance_store/tests/unit/test_swift_store_multibackend.py b/glance_store/tests/unit/test_swift_store_multibackend.py
index 493cdd24..1d70beb2 100644
--- a/glance_store/tests/unit/test_swift_store_multibackend.py
+++ b/glance_store/tests/unit/test_swift_store_multibackend.py
@@ -1446,8 +1446,8 @@ class TestStoreAuthV3(TestStoreAuthV1):
             auth_url=loc.store_location.swift_url + '/',
             username=username, password="key",
             project_name=tenant,
-            project_domain_id='default', project_domain_name=None,
-            user_domain_id='default', user_domain_name=None,)
+            project_domain_id='default', project_domain_name='default',
+            user_domain_id='default', user_domain_name='default',)
         mock_session.Session.assert_called_once_with(
             auth=mock_identity.V3Password(), verify=True)
         mock_client.Client.assert_called_once_with(