diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh
index dcf1cba7..41f0fb8c 100755
--- a/test/support/prepare_db.sh
+++ b/test/support/prepare_db.sh
@@ -13,6 +13,7 @@
 PREPARE_REDIS=yes
 PREPARE_PGSQL=yes
 DOWNLOAD_SQL_FILES=yes
+PG_PARALLEL=$(pg_config --version | (awk '{$2*=1000; if ($2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0))
 
 while [ -n "$1" ]; do
   if test "$1" = "--skip-pg"; then
@@ -92,6 +93,11 @@ if test x"$PREPARE_PGSQL" = xyes; then
   ALL_SQL_SCRIPTS="${REMOTE_SQL_SCRIPTS} ${LOCAL_SQL_SCRIPTS}"
   for i in ${ALL_SQL_SCRIPTS}
   do
+    # Strip PARALLEL labels for PostgreSQL releases before 9.6
+    if [ $PG_PARALLEL -eq 0 ]; then
+        sed -e 's/PARALLEL \= [A-Z]*,/''/g' \
+            -e 's/PARALLEL [A-Z]*/''/g' -i sql/$i.sql
+    fi  
     cat sql/${i}.sql |
       sed -e 's/cartodb\./public./g' -e "s/''cartodb''/''public''/g" |
       sed "s/:PUBLICUSER/${PUBLICUSER}/" |