diff --git a/tools/func-tests.sh b/tools/func-tests.sh
index 8a3f4a3..d648852 100755
--- a/tools/func-tests.sh
+++ b/tools/func-tests.sh
@@ -125,7 +125,12 @@ tox -e run -- --os-cloud devstack --purge-own-project --verbose # purges demo/de
 source $DEVSTACK_DIR/openrc demo invisible_to_admin
 assert_compute && assert_network && assert_volume
 
-tox -e run -- --os-auth-url http://localhost/identity --os-username demo --os-project-name invisible_to_admin --os-password $invisible_to_admin_demo_pass --purge-own-project --verbose
+tox -e run -- \
+    --os-auth-url http://localhost/identity \
+    --os-username demo --os-project-name invisible_to_admin \
+    --os-password $invisible_to_admin_demo_pass \
+    --os-domain-id=$OS_PROJECT_DOMAIN_ID \
+    --purge-own-project --verbose
 
 #source $DEVSTACK_DIR/openrc alt_demo alt_demo
 #assert_compute && assert_network && assert_volume
diff --git a/tools/populate.sh b/tools/populate.sh
index c0f7891..252cf4b 100755
--- a/tools/populate.sh
+++ b/tools/populate.sh
@@ -57,8 +57,11 @@ function wait_for_volume_to_be_available {
 # Check if needed environment variable OS_PROJECT_NAME is set and non-empty.
 : "${OS_PROJECT_NAME:?Need to set OS_PROJECT_NAME non-empty}"
 
-# Some random UUID + Unicode characters
-UUID="♫$(cat /proc/sys/kernel/random/uuid)✓"
+# Some random UUID
+# Commented to workaround a nova #1730756 with non-ASCII VM name:
+# https://bugs.launchpad.net/nova/+bug/1730756
+#UUID="♫$(cat /proc/sys/kernel/random/uuid)✓"
+UUID="$(cat /proc/sys/kernel/random/uuid)"
 # Name of external network
 EXTNET_NAME=${EXTNET_NAME:-public}
 # Name of flavor used to spawn a VM