diff --git a/src/pl/plperl/test/runtest b/src/pl/plperl/test/runtest
index a7c1d0ede9..2d0e487670 100755
--- a/src/pl/plperl/test/runtest
+++ b/src/pl/plperl/test/runtest
@@ -9,10 +9,10 @@ dropdb $DBNAME
 sleep 1
 
 echo "**** Create test database $DBNAME ****"
-createdb $DBNAME
+createdb $DBNAME || exit 1
 
 echo "**** Create procedural language plperl ****"
-createlang plperl $DBNAME
+createlang plperl $DBNAME || exit 1
 
 echo "**** Running test queries ****"
 psql -q -n -e $DBNAME <test_queries.sql > test.out 2>&1
diff --git a/src/pl/plpython/test.sh b/src/pl/plpython/test.sh
index facf29e268..9ed3c07662 100755
--- a/src/pl/plpython/test.sh
+++ b/src/pl/plpython/test.sh
@@ -7,6 +7,8 @@ dropdb $DBNAME > test.log 2>&1
 # drop failure is ok...
 echo " Done. ***"
 
+sleep 1
+
 echo -n "*** Create $DBNAME."
 if createdb $DBNAME >> test.log 2>&1 ; then
   echo " Done. ***"
diff --git a/src/pl/tcl/test/runtest b/src/pl/tcl/test/runtest
index 50b2be0775..b46604bd3f 100755
--- a/src/pl/tcl/test/runtest
+++ b/src/pl/tcl/test/runtest
@@ -9,10 +9,10 @@ dropdb $DBNAME
 sleep 1
 
 echo "**** Create test database $DBNAME ****"
-createdb $DBNAME
+createdb $DBNAME || exit 1
 
 echo "**** Create procedural language pltcl ****"
-createlang pltcl $DBNAME
+createlang pltcl $DBNAME || exit 1
 
 echo "**** Create tables, functions and triggers ****"
 psql -q -n $DBNAME <test_setup.sql