diff --git a/tools/setup_software.sh b/tools/setup_software.sh
index f518d16..71909d9 100755
--- a/tools/setup_software.sh
+++ b/tools/setup_software.sh
@@ -35,3 +35,6 @@ chown turbo-hipster:turbo-hipster /var/log/turbo-hipster
 
 mkdir -p /var/lib/turbo-hipster
 chown turbo-hipster:turbo-hipster /var/log/turbo-hipster
+
+mysql -u root -e "create user 'nova'@'localhost' identified by 'tester';"
+mysql -u root -e "grant all privileges on nova.* TO 'nova'@'localhost';"
diff --git a/turbo_hipster/task_plugins/gate_real_db_upgrade/nova_mysql_migrations.sh b/turbo_hipster/task_plugins/gate_real_db_upgrade/nova_mysql_migrations.sh
index 7b598c9..799c1b1 100755
--- a/turbo_hipster/task_plugins/gate_real_db_upgrade/nova_mysql_migrations.sh
+++ b/turbo_hipster/task_plugins/gate_real_db_upgrade/nova_mysql_migrations.sh
@@ -86,8 +86,6 @@ echo "Restoring test database $6"
 set -x
 mysql -u root -e "drop database $6"
 mysql -u root -e "create database $6"
-mysql -u root -e "create user '$4'@'localhost' identified by '$5';"
-mysql -u root -e "grant all privileges on $6.* TO '$4'@'localhost';"
 mysql -u $4 --password=$5 $6 < /$7
 set +x