diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 28b73f6..e5df47d 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -301,7 +301,7 @@ jobs:
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
         with:
           repository: klauspost/compress
-          ref: 2adf487b3e02f95ce7efd6e4953fda0ae7ecd080
+          ref: 2f236383d7c2faa8ef7e354ccecb926a5b47a24d
           path: compress
           persist-credentials: false
       - name: Avo Module Replacement
@@ -312,13 +312,48 @@ jobs:
           go mod tidy -modfile=go.mod
       - name: Generate
         working-directory: compress/s2/_generate
-        run: go run gen.go -out ../encodeblock_amd64.s -stubs ../encodeblock_amd64.go -pkg s2
+        run: go generate -v -x
       - name: Diff
         working-directory: compress/s2
         run: git diff
       - name: Test
         working-directory: compress/s2
         run: go test ./...
+  klauspost-compress-zstd:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v3.0.0
+        with:
+          go-version: 1.18.x
+          check-latest: true
+      - name: Checkout avo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+        with:
+          path: avo
+          persist-credentials: false
+      - name: Checkout klauspost/compress
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
+        with:
+          repository: klauspost/compress
+          ref: 2f236383d7c2faa8ef7e354ccecb926a5b47a24d
+          path: compress
+          persist-credentials: false
+      - name: Avo Module Replacement
+        working-directory: compress/zstd/_generate
+        run: |
+          go mod edit -modfile=go.mod -require=github.com/mmcloughlin/avo@v0.0.0-00010101000000-000000000000
+          go mod edit -modfile=go.mod -replace=github.com/mmcloughlin/avo=${{ github.workspace }}/avo
+          go mod tidy -modfile=go.mod
+      - name: Generate
+        working-directory: compress/zstd/_generate
+        run: go generate -v -x
+      - name: Diff
+        working-directory: compress/zstd
+        run: git diff
+      - name: Test
+        working-directory: compress/zstd
+        run: go test -short
   dgryski-go-bloomindex:
     runs-on: ubuntu-latest
     steps:
diff --git a/tests/thirdparty/projects.json b/tests/thirdparty/projects.json
index cd32056..7f6484c 100644
--- a/tests/thirdparty/projects.json
+++ b/tests/thirdparty/projects.json
@@ -232,7 +232,7 @@
             "stars": 2706
         },
         "default_branch": "master",
-        "version": "2adf487b3e02f95ce7efd6e4953fda0ae7ecd080",
+        "version": "2f236383d7c2faa8ef7e354ccecb926a5b47a24d",
         "packages": [
             {
                 "pkg": "s2",
@@ -241,7 +241,26 @@
                     {
                         "dir": "_generate",
                         "commands": [
-                            "go run gen.go -out ../encodeblock_amd64.s -stubs ../encodeblock_amd64.go -pkg s2"
+                            "go generate -v -x"
+                        ]
+                    }
+                ]
+            },
+            {
+                "pkg": "zstd",
+                "module": "_generate/go.mod",
+                "generate": [
+                    {
+                        "dir": "_generate",
+                        "commands": [
+                            "go generate -v -x"
+                        ]
+                    }
+                ],
+                "test": [
+                    {
+                        "commands": [
+                            "go test -short"
                         ]
                     }
                 ]