diff --git a/.travis.yml b/.travis.yml
index bbfbe798..671832f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,16 @@
+sudo: false
+
 addons:
-  postgresql: "9.3"
+  postgresql: "9.4"
+  apt:
+    packages:
+    - postgresql-plpython-9.4
+    - pkg-config
+    - libcairo2-dev
+    - libjpeg8-dev
+    - libgif-dev
 
 before_install:
-  - sudo apt-get update
-  - sudo apt-get install -y pkg-config libcairo2-dev libjpeg8-dev libgif-dev
-  - sudo apt-get install postgresql-plpython-9.3
   - createdb template_postgis
   - psql -c "CREATE EXTENSION postgis" template_postgis
 
diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh
index fd920e8d..ab9149a2 100755
--- a/test/support/prepare_db.sh
+++ b/test/support/prepare_db.sh
@@ -78,9 +78,9 @@ if test x"$PREPARE_PGSQL" = xyes; then
     sed "s/:TESTPASS/${TESTPASS}/" | 
     psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1
 
-  psql -c "CREATE EXTENSION plpythonu;" ${TEST_DB}
-#  curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql
-#  curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql
+  psql -c "CREATE LANGUAGE plpythonu;" ${TEST_DB}
+  curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryStatements.sql -o sql/CDB_QueryStatements.sql
+  curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/cdb/scripts-available/CDB_QueryTables.sql -o sql/CDB_QueryTables.sql
   cat sql/CDB_QueryStatements.sql sql/CDB_QueryTables.sql |
     psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1