diff --git a/sanitize_go1.8_test.go b/sanitize_go1.8_test.go
index a6d00a9..c983e9c 100644
--- a/sanitize_go1.8_test.go
+++ b/sanitize_go1.8_test.go
@@ -27,6 +27,7 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+//go:build go1.8
 // +build go1.8
 
 package bluemonday
diff --git a/sanitize_ltgo1.8_test.go b/sanitize_ltgo1.8_test.go
index a2000ce..a1cc89e 100644
--- a/sanitize_ltgo1.8_test.go
+++ b/sanitize_ltgo1.8_test.go
@@ -27,6 +27,7 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+//go:build go1.1 && !go1.8
 // +build go1.1,!go1.8
 
 package bluemonday
diff --git a/stringwriterwriter_go1.12.go b/stringwriterwriter_go1.12.go
index afa011e..5d96b97 100644
--- a/stringwriterwriter_go1.12.go
+++ b/stringwriterwriter_go1.12.go
@@ -1,3 +1,4 @@
+//go:build go1.12
 // +build go1.12
 
 package bluemonday
diff --git a/stringwriterwriter_ltgo1.12.go b/stringwriterwriter_ltgo1.12.go
index 9bc6747..ecdaa92 100644
--- a/stringwriterwriter_ltgo1.12.go
+++ b/stringwriterwriter_ltgo1.12.go
@@ -1,3 +1,4 @@
+//go:build go1.1 && !go1.12
 // +build go1.1,!go1.12
 
 package bluemonday