diff --git a/.travis.sh b/.travis.sh
index 91f3642..836d826 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -44,17 +44,8 @@ pgdg_repositories() {
 
 postgresql_install() {
 	if [ -z "${PGVERSION:-}" ]; then
-		PGVERSION="$( psql -d postgres -XAtc "select regexp_replace(current_setting('server_version'), '[.][0-9]+$', '')" )"
-	else
-		sudo service postgresql stop
-		xargs sudo apt-get -y --purge remove <<-packages
-			libpq-dev
-			libpq5
-			postgresql
-			postgresql-client-common
-			postgresql-common
-		packages
-		sudo rm -rf /var/lib/postgresql
+		echo 'PGVERSION environment variable not set.';
+		exit 1
 	fi
 
 	xargs sudo apt-get -y install <<-packages
diff --git a/.travis.yml b/.travis.yml
index 9a76afa..174f521 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
-language: common-lisp
-sudo: required
+language: shell
+os: linux
+dist: xenial
 
 env:
   matrix: