diff --git a/binding/binding.go b/binding/binding.go
index 5c8e235b5f..5caeb581af 100644
--- a/binding/binding.go
+++ b/binding/binding.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build !nomsgpack
 // +build !nomsgpack
 
 package binding
diff --git a/binding/binding_msgpack_test.go b/binding/binding_msgpack_test.go
index 9791a60763..04d9407971 100644
--- a/binding/binding_msgpack_test.go
+++ b/binding/binding_msgpack_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build !nomsgpack
 // +build !nomsgpack
 
 package binding
diff --git a/binding/binding_nomsgpack.go b/binding/binding_nomsgpack.go
index fd227b11a8..9afa3dcf6d 100644
--- a/binding/binding_nomsgpack.go
+++ b/binding/binding_nomsgpack.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build nomsgpack
 // +build nomsgpack
 
 package binding
diff --git a/binding/msgpack.go b/binding/msgpack.go
index a5bc2ad297..2a442996a6 100644
--- a/binding/msgpack.go
+++ b/binding/msgpack.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build !nomsgpack
 // +build !nomsgpack
 
 package binding
diff --git a/binding/msgpack_test.go b/binding/msgpack_test.go
index 296d3eb18c..75600ba830 100644
--- a/binding/msgpack_test.go
+++ b/binding/msgpack_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build !nomsgpack
 // +build !nomsgpack
 
 package binding
diff --git a/context_appengine.go b/context_appengine.go
index 38c189a0b8..d565843489 100644
--- a/context_appengine.go
+++ b/context_appengine.go
@@ -1,9 +1,10 @@
-// +build appengine
-
 // Copyright 2017 Manu Martinez-Almeida.  All rights reserved.
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build appengine
+// +build appengine
+
 package gin
 
 func init() {
diff --git a/errors_1.13_test.go b/errors_1.13_test.go
index a8f9a94e10..5fb6057baa 100644
--- a/errors_1.13_test.go
+++ b/errors_1.13_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 package gin
diff --git a/internal/json/json.go b/internal/json/json.go
index 480e8bff48..172aeb2414 100644
--- a/internal/json/json.go
+++ b/internal/json/json.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build !jsoniter
 // +build !jsoniter
 
 package json
diff --git a/internal/json/jsoniter.go b/internal/json/jsoniter.go
index 649a3cdb6a..232f8dcada 100644
--- a/internal/json/jsoniter.go
+++ b/internal/json/jsoniter.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build jsoniter
 // +build jsoniter
 
 package json
diff --git a/render/msgpack.go b/render/msgpack.go
index be2d45c51c..6ef5b6e514 100644
--- a/render/msgpack.go
+++ b/render/msgpack.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build !nomsgpack
 // +build !nomsgpack
 
 package render
diff --git a/render/render_msgpack_test.go b/render/render_msgpack_test.go
index e439ac48ed..8170fbe815 100644
--- a/render/render_msgpack_test.go
+++ b/render/render_msgpack_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT style
 // license that can be found in the LICENSE file.
 
+//go:build !nomsgpack
 // +build !nomsgpack
 
 package render