diff --git a/swift3/test/functional/setup_keystone b/swift3/test/functional/setup_keystone
index c0a96366..2b6ba3cd 100644
--- a/swift3/test/functional/setup_keystone
+++ b/swift3/test/functional/setup_keystone
@@ -73,12 +73,11 @@ _create_swift_accounts()
 
 _setup_keystone()
 {
+    rm -f ${TEST_DIR}/keystone.db 2>&1
+
     keystone-all --config-file conf/keystone.conf --debug > ${TEST_DIR}/log/keystone.log 2>&1 &
     export keystone_pid=$!
 
-    mysql -uroot -ppassword -e "DROP DATABASE IF EXISTS keystone;"
-    mysql -uroot -ppassword -e "CREATE DATABASE keystone CHARACTER SET utf8;"
-
     keystone-manage --config-file conf/keystone.conf --debug db_sync
     keystone-manage --config-file conf/keystone.conf --debug pki_setup