diff --git a/heat_integrationtests/common/clients.py b/heat_integrationtests/common/clients.py
index 96a34b7c53..afdc477a46 100644
--- a/heat_integrationtests/common/clients.py
+++ b/heat_integrationtests/common/clients.py
@@ -123,6 +123,8 @@ class ClientManager(object):
                 password=self._password())
 
     def _get_identity_client(self):
+        user_domain_id = self.conf.user_domain_id
+        project_domain_id = self.conf.project_domain_id
         user_domain_name = self.conf.user_domain_name
         project_domain_name = self.conf.project_domain_name
         kwargs = {
@@ -134,6 +136,8 @@ class ClientManager(object):
         # keystone v2 can't ignore domain details
         if self.auth_version == '3':
             kwargs.update({
+                'user_domain_id': user_domain_id,
+                'project_domain_id': project_domain_id,
                 'user_domain_name': user_domain_name,
                 'project_domain_name': project_domain_name})
         auth = password.Password(**kwargs)
diff --git a/heat_integrationtests/common/config.py b/heat_integrationtests/common/config.py
index 3cef5aa33a..4aa7e67fee 100644
--- a/heat_integrationtests/common/config.py
+++ b/heat_integrationtests/common/config.py
@@ -53,6 +53,12 @@ HeatGroup = [
     cfg.StrOpt('project_domain_name',
                help="Project domain name, if keystone v3 auth_url"
                     "is used"),
+    cfg.StrOpt('user_domain_id',
+               help="User domain id, if keystone v3 auth_url"
+                    "is used"),
+    cfg.StrOpt('project_domain_id',
+               help="Project domain id, if keystone v3 auth_url"
+                    "is used"),
     cfg.StrOpt('region',
                help="The region name to use"),
     cfg.StrOpt('instance_type',
diff --git a/heat_integrationtests/functional/test_event_sinks.py b/heat_integrationtests/functional/test_event_sinks.py
index e4a23ff6fc..ea66b7db33 100644
--- a/heat_integrationtests/functional/test_event_sinks.py
+++ b/heat_integrationtests/functional/test_event_sinks.py
@@ -43,7 +43,11 @@ resources:
                     'os_username': self.conf.username,
                     'os_password': self.conf.password,
                     'os_project_name': self.conf.tenant_name,
-                    'os_auth_url': self.conf.auth_url
+                    'os_auth_url': self.conf.auth_url,
+                    'os_user_domain_id': self.conf.user_domain_id,
+                    'os_project_domain_id': self.conf.project_domain_id,
+                    'os_user_domain_name': self.conf.user_domain_name,
+                    'os_project_domain_name': self.conf.project_domain_name
                 }
             }
         }
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 96aec0708d..1fb63d639f 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -33,6 +33,8 @@ iniset $conf_file heat_plugin username $OS_USERNAME
 iniset $conf_file heat_plugin password $OS_PASSWORD
 iniset $conf_file heat_plugin tenant_name $OS_PROJECT_NAME
 iniset $conf_file heat_plugin auth_url $OS_AUTH_URL
+iniset $conf_file heat_plugin user_domain_id $OS_USER_DOMAIN_ID
+iniset $conf_file heat_plugin project_domain_id $OS_PROJECT_DOMAIN_ID
 iniset $conf_file heat_plugin user_domain_name $OS_USER_DOMAIN_NAME
 iniset $conf_file heat_plugin project_domain_name $OS_PROJECT_DOMAIN_NAME
 iniset $conf_file heat_plugin region $OS_REGION_NAME