diff --git a/env/bitbucket/prepare_for_test.sh b/env/bitbucket/prepare_for_test.sh
index 612ab3b3..7845905b 100755
--- a/env/bitbucket/prepare_for_test.sh
+++ b/env/bitbucket/prepare_for_test.sh
@@ -4,8 +4,9 @@
 export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
 
-export PG_USER="postgres"
-export PG_PORT=5432
+export PGUSER="postgres"
+export PGPORT=5432
+export PGHOST="localhost"
 
 export OPENSSL_CONF=/etc/ssl/
 
diff --git a/prepare_server.sh b/prepare_server.sh
index 1cc18705..4316e0df 100755
--- a/prepare_server.sh
+++ b/prepare_server.sh
@@ -40,10 +40,9 @@ echo "SKIP_SETUP = ${SKIP_SETUP}"
 # migrate env vars to the built-in postgres variables
 if [ -z ${PGDATABASE+x} ]; then # var is empty
     PGDATABASE=${POSTGRES_DB:-vbv_lernwelt};
-    POSTGRES_DB=$PGDATABASE
 fi
 if [ -z ${PGHOST+x} ]; then # var is empty
-    PGHOST=${POSTGRES_DB:-localhost};
+    PGHOST=${POSTGRES_HOST:-localhost};
 fi
 if [ -z ${PGPORT+x} ]; then # var is empty
     PGPORT=${POSTGRES_PORT:-5432}
@@ -59,7 +58,7 @@ if [ "$SKIP_SETUP" = false ]; then
     echo "Check postgres connection"
     psql -d postgres -c "SELECT 1" # use default db to connect to
     echo "Drop all connections to $PGDATABASE"
-    psql -c "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$POSTGRES_DB' AND pid <> pg_backend_pid();" > /dev/null 2>&1
+    psql -c "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$PGDATABASE' AND pid <> pg_backend_pid();" > /dev/null 2>&1 || true
     echo "Drop database: $PGDATABASE"
     psql -d postgres -c "drop database if exists $PGDATABASE;" # use default db to drop another database, can't drop the currently connected database
     echo "Create database: $PGDATABASE"