diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67ffeaab..6880ae90 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,24 +14,38 @@ jobs:
 
     strategy:
       matrix:
+        go-version: [1.15, 1.16]
+        pg-version: [9.6, 10, 11, 12, 13]
         include:
-          - go-version: 1.15
-            pg-version: 13
+          - pg-version: 9.6
             pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
-          - go-version: 1.16
-            pg-version: 9.6
+            pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test"
+            pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
+            pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require
+            pgx-test-md5-password-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
+            pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test
+          - pg-version: 10
             pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
-          - go-version: 1.16
-            pg-version: 10
+            pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test"
+            pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
+            pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require
+            pgx-test-md5-password-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
+            pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test
+          - pg-version: 11
             pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
-          - go-version: 1.16
-            pg-version: 11
+            pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test"
+            pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
+            pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require
+            pgx-test-md5-password-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
+            pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test
+          - pg-version: 12
             pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
-          - go-version: 1.16
-            pg-version: 12
-            pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
-          - go-version: 1.16
-            pg-version: 13
+            pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test"
+            pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
+            pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require
+            pgx-test-md5-password-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
+            pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test
+          - pg-version: 13
             pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test
             pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test"
             pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test