diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..3183031
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      matrix:
+        pg: [17, 16, 15, 14, 13, 12, 11, 10]
+    name: 🐘 PostgreSQL ${{ matrix.pg }}
+    runs-on: ubuntu-latest
+    container: pgxn/pgxn-tools
+    steps:
+      - name: Start PostgreSQL ${{ matrix.pg }}
+        run: pg-start ${{ matrix.pg }}
+      - name: Check out the repo
+        uses: actions/checkout@v4
+      - name: Test on PostgreSQL ${{ matrix.pg }}
+        run: make test PGUSER=postgres
diff --git a/.gitignore b/.gitignore
index facf651..8e63124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ regression.out
 # Misc
 tmp/
 .DS_Store
+.claude/settings.local.json
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0c4e016..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: c
-before_install:
-  - wget https://gist.github.com/petere/5893799/raw/apt.postgresql.org.sh
-  - sudo sh ./apt.postgresql.org.sh
-  - sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs 2>/dev/null)-pgdg main $PGVERSION >> /etc/apt/sources.list.d/pgdg.list"
-env:
-  - PGVERSION=9.6
-  - PGVERSION=9.5
-  - PGVERSION=9.4
-  - PGVERSION=9.3
-  - PGVERSION=9.2
-
-script: bash ./pg-travis-test.sh
diff --git a/pg-travis-test.sh b/pg-travis-test.sh
deleted file mode 100644
index f63ae43..0000000
--- a/pg-travis-test.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# Based on https://gist.github.com/petere/6023944
-
-set -eux
-
-sudo apt-get update
-
-packages="python-setuptools postgresql-$PGVERSION postgresql-server-dev-$PGVERSION postgresql-common"
-
-# bug: http://www.postgresql.org/message-id/20130508192711.GA9243@msgid.df7cb.de
-sudo update-alternatives --remove-all postmaster.1.gz
-
-# stop all existing instances (because of https://github.com/travis-ci/travis-cookbooks/pull/221)
-sudo service postgresql stop
-# and make sure they don't come back
-echo 'exit 0' | sudo tee /etc/init.d/postgresql
-sudo chmod a+x /etc/init.d/postgresql
-
-sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $packages
-
-sudo easy_install pgxnclient
-
-PGPORT=55435 
-PGCLUSTER_NAME=test
-
-export PGCLUSTER=9.6/$PGCLUSTER_NAME
-env | grep PG
-which pg_dump
-
-sudo pg_createcluster --start $PGVERSION $PGCLUSTER_NAME -p $PGPORT -- -A trust
-
-# TODO: have base.mk support dynamic sudo
-sudo PGPORT=$PGPORT PGUSER=postgres PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config make test
-
-[ ! -e test/regression.diffs ]
diff --git a/pgxntool/HISTORY.asc b/pgxntool/HISTORY.asc
index b69c9d1..9cb793b 100644
--- a/pgxntool/HISTORY.asc
+++ b/pgxntool/HISTORY.asc
@@ -1,5 +1,11 @@
 STABLE
 ------
+== Support 13+
+The `--load-language` option was removed from `pg_regress` in 13.
+
+== Reduce verbosity from test setup
+As part of this change, you will want to review the changes to test/deps.sql.
+
 === Support asciidoc documentation targets
 By default, if asciidoctor or asciidoc exists on the system, any files in doc/ that end in .adoc or .asciidoc will be processed to html.
 See the README for full details.
@@ -12,11 +18,12 @@ If a test input file changes we certainly need to re-run tests.
 
 === Have test/pgxntool/setup.sql install tap before running deps.sql
 
-=== Reduce verbosity from test setup
-As part of this change, you will want to review the changes to test/deps.sql.
-
 === Support other asciidoc extensions
 
+=== Create the test/sql/ directory during setup
+
+=== Use `--sudo` option when installing pgtap
+
 0.2.0
 -----
 ### Stop using $(VERSION)
diff --git a/pgxntool/base.mk b/pgxntool/base.mk
index ce918db..a976ebb 100644
--- a/pgxntool/base.mk
+++ b/pgxntool/base.mk
@@ -36,7 +36,7 @@ TEST_SQL_FILES		+= $(wildcard $(TESTDIR)/sql/*.sql)
 TEST_RESULT_FILES	 = $(patsubst $(TESTDIR)/sql/%.sql,$(TESTDIR)/expected/%.out,$(TEST_SQL_FILES))
 TEST_FILES	 = $(TEST_SOURCE_FILES) $(TEST_SQL_FILES)
 REGRESS		 = $(sort $(notdir $(subst .source,,$(TEST_FILES:.sql=)))) # Sort is to get unique list
-REGRESS_OPTS = --inputdir=$(TESTDIR) --outputdir=$(TESTOUT) --load-language=plpgsql
+REGRESS_OPTS = --inputdir=$(TESTDIR) --outputdir=$(TESTOUT) # See additional setup below
 MODULES      = $(patsubst %.c,%,$(wildcard src/*.c))
 ifeq ($(strip $(MODULES)),)
 MODULES =# Set to NUL so PGXS doesn't puke
@@ -57,8 +57,10 @@ GE91		 = $(call test, $(MAJORVER), -ge, 91)
 
 ifeq ($(GE91),yes)
 all: $(EXTENSION_VERSION_FILES)
+endif
 
-#DATA = $(wildcard sql/*--*.sql)
+ifeq ($($call test, $(MAJORVER), -lt 13), yes)
+	REGRESS_OPTS += --load-language=plpgsql
 endif
 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -77,8 +79,12 @@ installcheck: $(TEST_RESULT_FILES) $(TEST_OUT_FILES) $(TEST_SQL_FILES) $(TEST_SO
 
 # make test: run any test dependencies, then do a `make install installcheck`.
 # If regressions are found, it will output them.
+#
+# This used to depend on clean as well, but that causes problems with
+# watch-make if you're generating intermediate files. If tests end up needing
+# clean it's an indication of a missing dependency anyway.
 .PHONY: test
-test: clean testdeps install installcheck
+test: testdeps install installcheck
 	@if [ -r $(TESTOUT)/regression.diffs ]; then cat $(TESTOUT)/regression.diffs; fi
 
 # make results: runs `make test` and copy all result files to expected
@@ -220,6 +226,6 @@ installcheck: pgtap
 pgtap: $(DESTDIR)$(datadir)/extension/pgtap.control
 
 $(DESTDIR)$(datadir)/extension/pgtap.control:
-	pgxn install pgtap
+	pgxn install pgtap --sudo
 
 endif # fndef PGXNTOOL_NO_PGXS_INCLUDE
diff --git a/pgxntool/setup.sh b/pgxntool/setup.sh
index 3730a2b..881ccaa 100755
--- a/pgxntool/setup.sh
+++ b/pgxntool/setup.sh
@@ -46,6 +46,7 @@ git add META.json
 mkdir -p sql test src
 
 cd test
+mkdir -p sql
 safecp ../pgxntool/test/deps.sql deps.sql
 [ -d pgxntool ] || ln -s ../pgxntool/test/pgxntool .
 git add pgxntool
diff --git a/sql/.object_reference.sql.swo b/sql/.object_reference.sql.swo
deleted file mode 100644
index b3912fe..0000000
Binary files a/sql/.object_reference.sql.swo and /dev/null differ
diff --git a/test/dump/run.sh b/test/dump/run.sh
index 4d0c7a3..6896f68 100755
--- a/test/dump/run.sh
+++ b/test/dump/run.sh
@@ -26,7 +26,7 @@ if [ "$1" == "-f" ]; then
 fi
 
 echo Creating dump database
-createdb test_dump && psql -f test/dump/load_all.sql test_dump > $create_log || die 3 "Unable to create dump database"
+createdb test_dump && psql -Xf test/dump/load_all.sql test_dump > $create_log || die 3 "Unable to create dump database"
 
 # Ensure no errors in log
 check_log() {
@@ -45,8 +45,8 @@ check_log $create_log creation
 
 echo Running dump and restore
 # No real need to cat the log on failure here; psql will generate an error and even if not verify will almost certainly catch it
-createdb test_load && PAGER='' psql -c '\df pg_get_object_address' test_load || die 5 'crap'
-(echo 'BEGIN;' && pg_dump test_dump && echo 'COMMIT;') | psql -q -v VERBOSITY=verbose -v ON_ERROR_STOP=true test_load > $restore_log
+createdb test_load && PAGER='' psql -Xc '\df pg_get_object_address' test_load || die 5 'crap'
+(echo 'BEGIN;' && pg_dump test_dump && echo 'COMMIT;') | psql -q -X -v VERBOSITY=verbose -v ON_ERROR_STOP=true test_load > $restore_log
 rc=$?
 if [ $rc -ne 0 ]; then
   cat $restore_log
@@ -54,7 +54,7 @@ if [ $rc -ne 0 ]; then
 fi
 
 echo Verifying restore
-psql -f test/dump/verify.sql test_load > $verify_log || die 5 "Test failed"
+psql -Xf test/dump/verify.sql test_load > $verify_log || die 5 "Test failed"
 
 check_log $create_log verify