diff --git a/rally_openstack/verification/tempest/config.py b/rally_openstack/verification/tempest/config.py
index ff38b50c..0ba568f0 100644
--- a/rally_openstack/verification/tempest/config.py
+++ b/rally_openstack/verification/tempest/config.py
@@ -43,7 +43,7 @@ class TempestConfigfileManager(object):
         self.clients = self.credential.clients()
         self.available_services = self.clients.services().values()
 
-        self.conf = configparser.ConfigParser()
+        self.conf = configparser.ConfigParser(allow_no_value=True)
 
     def _get_service_type_by_service_name(self, service_name):
         for s_type, s_name in self.clients.services().items():
diff --git a/tests/unit/verification/tempest/test_config.py b/tests/unit/verification/tempest/test_config.py
index dffd238b..8b8cb82f 100644
--- a/tests/unit/verification/tempest/test_config.py
+++ b/tests/unit/verification/tempest/test_config.py
@@ -148,6 +148,13 @@ class TempestConfigfileManagerTestCase(test.TestCase):
                 "False",
                 self.tempest.conf.get("identity-feature-enabled", "api_v2"))
 
+        # Test a conf setting with a None value
+        try:
+            self.tempest.conf.set("identity", "region", None)
+        except TypeError as e:
+            self.fail("self.tempest.conf.set('identity', 'region', None) "
+                      "raised a TypeError: " + str(e))
+
     def test__configure_network_if_neutron(self):
         self.tempest.available_services = ["neutron"]
         client = self.tempest.clients.neutron()