diff --git a/.cirrus.yml b/.cirrus.yml
index c62d08f..2525b29 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,6 +1,6 @@
 env:
   CIRRUS_CLONE_DEPTH: 1
-  GO_VERSION: go1.17.8
+  GO_VERSION: go1.18
 
 freebsd_12_task:
   freebsd_instance:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7f1caa7..216cf42 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
   build-and-test:
     strategy:
       matrix:
-        go-version: [ '1.15' , '1.16', '1.17', '1.18.0-rc.1' ]
+        go-version: [ '1.16', '1.17', '1.18' ]
         os: [ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11]
     runs-on: ${{ matrix.os }}
 
@@ -26,11 +26,11 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Check formatting
-      if: ${{ matrix.go-version == '1.17' && matrix.os == 'ubuntu-20.04' }}
+      if: ${{ matrix.go-version == '1.18' && matrix.os == 'ubuntu-20.04' }}
       run: diff -u <(echo -n) <(gofmt -d .)
 
     - name: Check Go modules
-      if: ${{ matrix.go-version == '1.17' && matrix.os == 'ubuntu-20.04' }}
+      if: ${{ matrix.go-version == '1.18' && matrix.os == 'ubuntu-20.04' }}
       run: |
         go mod tidy
         git diff --exit-code