diff --git a/.travis.yml b/.travis.yml
index 995b692..3b67d62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,20 @@
 sudo: required
+dist: focal
 language: ruby
 rvm:
-  - "2.0.0"
+  - "2.4.0"
   - ruby-head
 env:
-  - "PGVERSION=10.0-1-linux-x64 PATH=\"/opt/PostgreSQL/10/bin:$PATH\""
-  - "PGVERSION=9.3.19-1-linux-x64 PATH=\"/opt/PostgreSQL/9.3/bin:$PATH\""
+  - "PGVERSION=14"
+  - "PGVERSION=9.6"
 before_install:
-  - gem install bundler
+  - gem install bundler --no-doc --conservative
   - bundle install
-  # Download and install postgresql version to test against in /opt
-  - |
-    wget http://get.enterprisedb.com/postgresql/postgresql-$PGVERSION.run && \
-      chmod +x postgresql-$PGVERSION.run && \
-      sudo ./postgresql-$PGVERSION.run --extract-only 1 --mode unattended
+  # Download and install postgresql version to test against in /opt (for non-cross compile only)
+  - echo "deb http://apt.postgresql.org/pub/repos/apt/ ${TRAVIS_DIST}-pgdg main $PGVERSION" | sudo tee -a /etc/apt/sources.list.d/pgdg.list
+  - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  - sudo apt -y update
+  - sudo apt -y --allow-downgrades install postgresql-$PGVERSION libpq-dev
+  - export PATH=/usr/lib/postgresql/$PGVERSION/bin:$PATH
+
 script: rake test
diff --git a/appveyor.yml b/appveyor.yml
index 51b2a1b..e558224 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,5 @@
+image: Visual Studio 2019
+
 init:
   - set PATH=C:/Ruby%ruby_version%/bin;c:/Program Files/Git/cmd;c:/Windows/system32;C:/Windows/System32/WindowsPowerShell/v1.0
   - set RUBYOPT=--verbose
@@ -6,7 +8,7 @@ install:
   - ver
   - ruby --version
   - gem --version
-  - gem install bundler --conservative
+  - gem install bundler --no-doc --conservative
   - bundle install
 
 build_script:
@@ -19,7 +21,7 @@ test_script:
 
 environment:
   matrix:
-    - ruby_version: "25-x64"
-      PGVER: 10
-    - ruby_version: "22"
+    - ruby_version: "27-x64"
+      PGVER: 13
+    - ruby_version: "24"
       PGVER: 10