diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index bfb7e59..25d8b09 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -27,20 +27,26 @@
 # This section contains configuration options used when executing tests
 # against the OpenStack Compute API.
 
+# Allows test cases to create/destroy tenants and users. This option
+# enables isolated test cases and better parallel execution,
+# but also requires that OpenStack Identity API admin credentials
+# are known.
+allow_tenant_isolation = true
+
 # This should be the username of a user WITHOUT administrative privileges
-username = {$USERNAME}
+username = demo
 # The above non-administrative user's password
-password = {$PASSWORD}
+password = pass
 # The above non-administrative user's tenant name
-tenant_name = {$TENANT_NAME}
+tenant_name = demo
 
 # This should be the username of an alternate user WITHOUT
 # administrative privileges
-alt_username = {$ALT_USERNAME}
+alt_username = alt_demo
 # The above non-administrative user's password
-alt_password = {$ALT_PASSWORD}
+alt_password = pass
 # The above non-administrative user's tenant name
-alt_tenant_name = {$ALT_TENANT_NAME}
+alt_tenant_name = alt_demo
 
 # Reference data for tests. The ref and ref_alt should be
 # distinct images/flavors.
@@ -109,11 +115,11 @@
 port = 9292
 
 # This should be the username of a user WITHOUT administrative privileges
-username = {$USERNAME}
+username = demo
 # The above non-administrative user's password
-password = {$PASSWORD}
+password = pass
 # The above non-administrative user's tenant name
-tenant_name = {$TENANT_NAME}
+tenant_name = demo
 
 [compute-admin]
 # This section contains configuration options for an administrative
@@ -121,14 +127,26 @@
 # the admin-only parts of the Compute API
 
 # This should be the username of a user WITH administrative privileges
-username = {$ADMIN_USERNAME}
+username = admin
 # The above administrative user's password
-password = {$ADMIN_PASSWORD}
+password = pass
 # The above administrative user's tenant name
-tenant_name = {$ADMIN_TENANT_NAME}
+tenant_name = admin
 
 [network]
 # This section contains configuration options used when executing tests
 # against the OpenStack Network API.
 api_version = v1.1
 catalog_type = network
+
+[identity-admin]
+# This section contains configuration options for an administrative
+# user of the Compute API. These options are used in tests that stress
+# the admin-only parts of the Compute API
+
+# This should be the username of a user WITH administrative privileges
+username = admin
+# The above administrative user's password
+password = pass
+# The above administrative user's tenant name
+tenant_name = admin
diff --git a/etc/tempest.conf.tpl b/etc/tempest.conf.tpl
index fcd6424..e6a3891 100644
--- a/etc/tempest.conf.tpl
+++ b/etc/tempest.conf.tpl
@@ -23,6 +23,12 @@
 # This section contains configuration options used when executing tests
 # against the OpenStack Compute API.
 
+# Allows test cases to create/destroy tenants and users. This option
+# enables isolated test cases and better parallel execution,
+# but also requires that OpenStack Identity API admin credentials
+# are known.
+allow_tenant_isolation = %COMPUTE_ALLOW_TENANT_ISOLATION%
+
 # This should be the username of a user WITHOUT administrative privileges
 username = %USERNAME%
 # The above non-administrative user's password
@@ -100,8 +106,20 @@
 # the admin-only parts of the Compute API
 
 # This should be the username of a user WITH administrative privileges
-username = %ADMIN_USERNAME%
+username = %COMPUTE_ADMIN_USERNAME%
 # The above administrative user's password
-password = %ADMIN_PASSWORD%
+password = %COMPUTE_ADMIN_PASSWORD%
 # The above administrative user's tenant name
-tenant_name = %ADMIN_TENANT_NAME%
+tenant_name = %COMPUTE_ADMIN_TENANT_NAME%
+
+[identity-admin]
+# This section contains configuration options for an administrative
+# user of the Compute API. These options are used in tests that stress
+# the admin-only parts of the Compute API
+
+# This should be the username of a user WITH administrative privileges
+username = %IDENTITY_ADMIN_USERNAME%
+# The above administrative user's password
+password = %IDENTITY_ADMIN_PASSWORD%
+# The above administrative user's tenant name
+tenant_name = %IDENTITY_ADMIN_TENANT_NAME%