diff --git a/rally_openstack/verification/tempest/config.py b/rally_openstack/verification/tempest/config.py
index 26e02a61..0d3d7001 100644
--- a/rally_openstack/verification/tempest/config.py
+++ b/rally_openstack/verification/tempest/config.py
@@ -132,6 +132,11 @@ class TempestConfigfileManager(object):
         self.conf.set(section_name, "auth_version", "v%s" % target_version)
         self.conf.set(section_name, "uri", uri)
         self.conf.set(section_name, "uri_v3", uri_v3)
+        if self.credential.endpoint_type:
+            self.conf.set(section_name, "v2_endpoint_type",
+                          self.credential.endpoint_type)
+            self.conf.set(section_name, "v3_endpoint_type",
+                          self.credential.endpoint_type)
 
         self.conf.set(section_name, "disable_ssl_certificate_validation",
                       str(self.credential.https_insecure))