diff --git a/go.mod b/go.mod
index 9ebec69e706d..d9e00addc440 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/Antonboom/nilnil v0.1.5
 	github.com/BurntSushi/toml v1.3.2
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24
-	github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0
+	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0
 	github.com/OpenPeeDeeP/depguard/v2 v2.1.0
 	github.com/alexkohler/nakedret/v2 v2.0.2
 	github.com/alexkohler/prealloc v1.0.0
diff --git a/go.sum b/go.sum
index 4ee5fc1a172a..45b6dab32167 100644
--- a/go.sum
+++ b/go.sum
@@ -54,8 +54,8 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
-github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts=
-github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0=
+github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 h1:3ZBs7LAezy8gh0uECsA6CGU43FF3zsx5f4eah5FxTMA=
+github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0/go.mod h1:rZLTje5A9kFBe0pzhpe2TdhRniBF++PRHQuRpR8esVc=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/OpenPeeDeeP/depguard/v2 v2.1.0 h1:aQl70G173h/GZYhWf36aE5H0KaujXfVMnn/f1kSDVYY=
diff --git a/pkg/golinters/exhaustruct.go b/pkg/golinters/exhaustruct.go
index 37ea055d3ef7..5272879e1db1 100644
--- a/pkg/golinters/exhaustruct.go
+++ b/pkg/golinters/exhaustruct.go
@@ -1,7 +1,7 @@
 package golinters
 
 import (
-	"github.com/GaijinEntertainment/go-exhaustruct/v2/pkg/analyzer"
+	"github.com/GaijinEntertainment/go-exhaustruct/v3/analyzer"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
diff --git a/test/testdata/exhaustruct.go b/test/testdata/exhaustruct.go
index 35675a5e6a82..e8c3a4031d9a 100644
--- a/test/testdata/exhaustruct.go
+++ b/test/testdata/exhaustruct.go
@@ -22,7 +22,7 @@ func exhaustruct() {
 	}
 
 	// failPrivate
-	_ = Exhaustruct{ // want "c is missing in Exhaustruct"
+	_ = Exhaustruct{ // want "testdata.Exhaustruct is missing field c"
 		A: "a",
 		B: 0,
 		D: 1.0,
@@ -30,7 +30,7 @@ func exhaustruct() {
 	}
 
 	// fail
-	_ = Exhaustruct{ // want "B is missing in Exhaustruct"
+	_ = Exhaustruct{ // want "testdata.Exhaustruct is missing field B"
 		A: "a",
 		c: false,
 		D: 1.0,
@@ -38,7 +38,7 @@ func exhaustruct() {
 	}
 
 	// failMultiple
-	_ = Exhaustruct{ // want "B, D are missing in Exhaustruct"
+	_ = Exhaustruct{ // want "testdata.Exhaustruct is missing fields B, D"
 		A: "a",
 		c: false,
 		E: time.Now(),
diff --git a/test/testdata/exhaustruct_custom.go b/test/testdata/exhaustruct_custom.go
index 60d00a5c2180..11105af0c48a 100644
--- a/test/testdata/exhaustruct_custom.go
+++ b/test/testdata/exhaustruct_custom.go
@@ -23,7 +23,7 @@ func exhaustructCustom() {
 	}
 
 	// fail
-	_ = ExhaustructCustom{ // want "B is missing in ExhaustructCustom"
+	_ = ExhaustructCustom{ // want "testdata.ExhaustructCustom is missing field B"
 		A: "a",
 		c: false,
 		D: 1.0,
@@ -31,14 +31,14 @@ func exhaustructCustom() {
 	}
 
 	// failMultiple
-	_ = ExhaustructCustom{ // want "B, D are missing in ExhaustructCustom"
+	_ = ExhaustructCustom{ // want "testdata.ExhaustructCustom is missing fields B, D"
 		A: "a",
 		c: false,
 		E: time.Now(),
 	}
 
 	//  failPrivate
-	_ = ExhaustructCustom{ // want "c is missing in ExhaustructCustom"
+	_ = ExhaustructCustom{ // want "testdata.ExhaustructCustom is missing field c"
 		A: "a",
 		B: 0,
 		D: 1.0,