diff --git a/setup-test-env-postgresql.sh b/setup-test-env-postgresql.sh
index 9bc6f4d72..90b05a854 100644
--- a/setup-test-env-postgresql.sh
+++ b/setup-test-env-postgresql.sh
@@ -14,14 +14,16 @@ check_for_cmd pg_config
 
 # Start PostgreSQL process for tests
 PGSQL_DATA=`mktemp -d /tmp/CEILO-PGSQL-XXXXX`
-trap "clean_exit ${PGSQL_DATA}" EXIT
 PGSQL_PATH=`pg_config --bindir`
+PGSQL_PORT=9823
 ${PGSQL_PATH}/initdb -E UTF8 ${PGSQL_DATA}
-mkfifo ${PGSQL_DATA}/out
-${PGSQL_PATH}/postgres -N 100 -F -k ${PGSQL_DATA} -D ${PGSQL_DATA} -p 9823 &> ${PGSQL_DATA}/out &
-# Wait for PostgreSQL to start listening to connections
-wait_for_line "database system is ready to accept connections" ${PGSQL_DATA}/out
-export CEILOMETER_TEST_PGSQL_URL="postgresql:///?host=${PGSQL_DATA}&port=9823&dbname=template1"
+LANGUAGE=C ${PGSQL_PATH}/pg_ctl -w -D ${PGSQL_DATA} -o "-N 100 -F -k ${PGSQL_DATA} -p ${PGSQL_PORT}" start
+export CEILOMETER_TEST_PGSQL_URL="postgresql:///?host=${PGSQL_DATA}&port=${PGSQL_PORT}&dbname=template1"
 
 # Yield execution to venv command
 $*
+
+ret=$?
+${PGSQL_PATH}/pg_ctl -w -D ${PGSQL_DATA} -o "-p ${PGSQL_PORT}" stop
+rm -rf ${PGSQL_DATA}
+exit ${ret}