diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
index ca16727c273..d633e4f137a 100644
--- a/.github/workflows/codegen.yml
+++ b/.github/workflows/codegen.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java-version: ['11', '8']
-        go-version: [1.16]
+        go-version: [1.17]
     env:
       JAVA_TOOL_OPTIONS: "-Xmx2g"
     steps:
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 95c2e96fd27..9af2f0379a2 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        go-version: [1.16, 1.15]
+        go-version: [1.17, 1.16, 1.15]
     steps:
     - uses: actions/checkout@v2
 
@@ -34,7 +34,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        go-version: [1.16, 1.15]
+        go-version: [1.17, 1.16, 1.15]
     env:
       EACHMODULE_SKIP: "internal\\repotools\\changes"
     steps:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 41010c548ae..4e311b2b0b5 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -11,16 +11,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-latest]  # other options: macos-latest, windows-latest
     steps:
       - uses: actions/checkout@v2
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version
+          # Required: the version of golangci-lint is required and must be
+          # specified without patch version
           version: latest
-          # the following causes golangci-init to do nothing, so all it does is install golang and golangci
+          # the following causes golangci-init to do nothing, so all it does is
+          # install golang and golangci
           args: --version
           # Show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
diff --git a/Makefile b/Makefile
index 2ce85f2afae..c7d29055cd6 100644
--- a/Makefile
+++ b/Makefile
@@ -442,32 +442,24 @@ sdkv1check:
 ###################
 # Sandbox Testing #
 ###################
-.PHONY: sandbox-tests sandbox-build-go1.15 sandbox-go1.15 sandbox-test-go1.15 sandbox-build-go1.16 \
-sandbox-go1.16 sandbox-test-go1.16 sandbox-build-gotip sandbox-gotip sandbox-test-gotip update-aws-golang-tip
-
-sandbox-tests: sandbox-test-go1.15 sandbox-test-go1.16 sandbox-test-gotip
-
-sandbox-build-go1.15:
-	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.15 -t "aws-sdk-go-v2-1.15" .
-sandbox-go1.15: sandbox-build-go1.15
-	docker run -i -t aws-sdk-go-v2-1.15 bash
-sandbox-test-go1.15: sandbox-build-go1.15
-	docker run -t aws-sdk-go-v2-1.15
-
-sandbox-build-go1.16:
-	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.16 -t "aws-sdk-go-v2-1.16" .
-sandbox-go1.16: sandbox-build-go1.16
-	docker run -i -t aws-sdk-go-v2-1.16 bash
-sandbox-test-go1.16: sandbox-build-go1.16
-	docker run -t aws-sdk-go-v2-1.16
-
-sandbox-build-gotip:
-	@echo "Run make update-aws-golang-tip, if this test fails because missing aws-golang:tip container"
-	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-v2-tip" .
-sandbox-gotip: sandbox-build-gotip
-	docker run -i -t aws-sdk-go-v2-tip bash
-sandbox-test-gotip: sandbox-build-gotip
-	docker run -t aws-sdk-go-v2-tip
+.PHONY: sandbox-tests sandbox-build-% sandbox-run-% sandbox-test-% update-aws-golang-tip
+
+sandbox-tests: sandbox-test-go1.15 sandbox-test-go1.16 sandbox-test-go1.17 sandbox-test-gotip
+
+sandbox-build-%:
+	@# sandbox-build-go1.17
+	@# sandbox-build-gotip
+	docker build \
+		-f ./internal/awstesting/sandbox/Dockerfile.test.$(subst sandbox-build-,,$@) \
+		-t "aws-sdk-go-$(subst sandbox-build-,,$@)" .
+sandbox-run-%: sandbox-build-%
+	@# sandbox-run-go1.17
+	@# sandbox-run-gotip
+	docker run -i -t "aws-sdk-go-$(subst sandbox-run-,,$@)" bash
+sandbox-test-%: sandbox-build-%
+	@# sandbox-test-go1.17
+	@# sandbox-test-gotip
+	docker run -t "aws-sdk-go-$(subst sandbox-test-,,$@)"
 
 update-aws-golang-tip:
 	docker build --no-cache=true -f ./internal/awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .
diff --git a/aws/generate.go b/aws/generate.go
index 206971a9baa..ee080ee9a6f 100644
--- a/aws/generate.go
+++ b/aws/generate.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/aws/logging_generate.go b/aws/logging_generate.go
index 522bbadea4a..8ac6c74bbb5 100644
--- a/aws/logging_generate.go
+++ b/aws/logging_generate.go
@@ -1,3 +1,4 @@
+//go:build clientlogmode
 // +build clientlogmode
 
 package main
diff --git a/aws/middleware/osname.go b/aws/middleware/osname.go
index 910936a968b..ba262dadcd0 100644
--- a/aws/middleware/osname.go
+++ b/aws/middleware/osname.go
@@ -1,3 +1,4 @@
+//go:build go1.16
 // +build go1.16
 
 package middleware
diff --git a/aws/middleware/osname_go115.go b/aws/middleware/osname_go115.go
index d93f9c7f703..e14a1e4ecb9 100644
--- a/aws/middleware/osname_go115.go
+++ b/aws/middleware/osname_go115.go
@@ -1,3 +1,4 @@
+//go:build !go1.16
 // +build !go1.16
 
 package middleware
diff --git a/config/codegen/main.go b/config/codegen/main.go
index 7612ac5c3f0..6f52eb29d62 100644
--- a/config/codegen/main.go
+++ b/config/codegen/main.go
@@ -1,3 +1,4 @@
+//go:build codegen
 // +build codegen
 
 package main
diff --git a/config/shared_config_other_test.go b/config/shared_config_other_test.go
index 41fee470c34..ff8192ae04e 100644
--- a/config/shared_config_other_test.go
+++ b/config/shared_config_other_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config
diff --git a/config/shared_config_windows_test.go b/config/shared_config_windows_test.go
index e9a8ed32d76..25e379f1e3b 100644
--- a/config/shared_config_windows_test.go
+++ b/config/shared_config_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config
diff --git a/credentials/ec2rolecreds/integration_test.go b/credentials/ec2rolecreds/integration_test.go
index 378a376ad31..2a62e069e1d 100644
--- a/credentials/ec2rolecreds/integration_test.go
+++ b/credentials/ec2rolecreds/integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration && ec2env
 // +build integration,ec2env
 
 package ec2rolecreds
diff --git a/credentials/ssocreds/os.go b/credentials/ssocreds/os.go
index ceca7dceecb..d4df39a7a22 100644
--- a/credentials/ssocreds/os.go
+++ b/credentials/ssocreds/os.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package ssocreds
diff --git a/feature/dynamodb/expression/error_test.go b/feature/dynamodb/expression/error_test.go
index 7b4b2217700..07e125fcf96 100644
--- a/feature/dynamodb/expression/error_test.go
+++ b/feature/dynamodb/expression/error_test.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package expression
diff --git a/feature/ec2/imds/integration_test.go b/feature/ec2/imds/integration_test.go
index 096fa2fadf9..b92167304e3 100644
--- a/feature/ec2/imds/integration_test.go
+++ b/feature/ec2/imds/integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration && ec2env
 // +build integration,ec2env
 
 package imds
diff --git a/feature/s3/manager/default_read_seeker_write_to.go b/feature/s3/manager/default_read_seeker_write_to.go
index 6d1dc6d2c42..e2ab143b6c0 100644
--- a/feature/s3/manager/default_read_seeker_write_to.go
+++ b/feature/s3/manager/default_read_seeker_write_to.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package manager
diff --git a/feature/s3/manager/default_writer_read_from.go b/feature/s3/manager/default_writer_read_from.go
index d5518145219..179fe10f403 100644
--- a/feature/s3/manager/default_writer_read_from.go
+++ b/feature/s3/manager/default_writer_read_from.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package manager
diff --git a/feature/s3/manager/integ_bucket_region_test.go b/feature/s3/manager/integ_bucket_region_test.go
index 3450bd18d24..92087723c7e 100644
--- a/feature/s3/manager/integ_bucket_region_test.go
+++ b/feature/s3/manager/integ_bucket_region_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package manager_test
diff --git a/feature/s3/manager/integ_shared_test.go b/feature/s3/manager/integ_shared_test.go
index c5205364ea7..e63239dbe73 100644
--- a/feature/s3/manager/integ_shared_test.go
+++ b/feature/s3/manager/integ_shared_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package manager_test
diff --git a/feature/s3/manager/integ_upload_test.go b/feature/s3/manager/integ_upload_test.go
index 9ddb0f3abd7..4c2a0c9e054 100644
--- a/feature/s3/manager/integ_upload_test.go
+++ b/feature/s3/manager/integ_upload_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package manager_test
diff --git a/feature/s3/manager/internal/integration/downloader/client.go b/feature/s3/manager/internal/integration/downloader/client.go
index 83d8d18681c..e2bb83ed34b 100644
--- a/feature/s3/manager/internal/integration/downloader/client.go
+++ b/feature/s3/manager/internal/integration/downloader/client.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package downloader
diff --git a/feature/s3/manager/internal/integration/downloader/config.go b/feature/s3/manager/internal/integration/downloader/config.go
index fc4f5dd0018..e0a1fe955c4 100644
--- a/feature/s3/manager/internal/integration/downloader/config.go
+++ b/feature/s3/manager/internal/integration/downloader/config.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package downloader
diff --git a/feature/s3/manager/internal/integration/downloader/main_test.go b/feature/s3/manager/internal/integration/downloader/main_test.go
index 30b4eed4249..d79739d2074 100644
--- a/feature/s3/manager/internal/integration/downloader/main_test.go
+++ b/feature/s3/manager/internal/integration/downloader/main_test.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package downloader
diff --git a/feature/s3/manager/internal/integration/uploader/client.go b/feature/s3/manager/internal/integration/uploader/client.go
index 93421c7e7d1..9481afc50a3 100644
--- a/feature/s3/manager/internal/integration/uploader/client.go
+++ b/feature/s3/manager/internal/integration/uploader/client.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package uploader
diff --git a/feature/s3/manager/internal/integration/uploader/config.go b/feature/s3/manager/internal/integration/uploader/config.go
index a89f43de068..ae0f2574667 100644
--- a/feature/s3/manager/internal/integration/uploader/config.go
+++ b/feature/s3/manager/internal/integration/uploader/config.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package uploader
diff --git a/feature/s3/manager/internal/integration/uploader/main_test.go b/feature/s3/manager/internal/integration/uploader/main_test.go
index fe240a9b8cb..122238d005b 100644
--- a/feature/s3/manager/internal/integration/uploader/main_test.go
+++ b/feature/s3/manager/internal/integration/uploader/main_test.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package uploader
diff --git a/internal/awstesting/sandbox/Dockerfile.test.go1.17 b/internal/awstesting/sandbox/Dockerfile.test.go1.17
new file mode 100644
index 00000000000..3fecc9962ab
--- /dev/null
+++ b/internal/awstesting/sandbox/Dockerfile.test.go1.17
@@ -0,0 +1,12 @@
+FROM golang:1.17
+
+ENV GOPROXY=direct
+
+ADD . /go/src/github.com/aws/aws-sdk-go-v2
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+		vim \
+	&& rm -rf /var/list/apt/lists/*
+
+WORKDIR /go/src/github.com/aws/aws-sdk-go-v2
+CMD ["make", "unit"]
diff --git a/internal/ini/fuzz.go b/internal/ini/fuzz.go
index 8d462f77e24..6e545b63bc4 100644
--- a/internal/ini/fuzz.go
+++ b/internal/ini/fuzz.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package ini
diff --git a/internal/ini/fuzz_test.go b/internal/ini/fuzz_test.go
index fb3d9465842..49bea5b18d5 100644
--- a/internal/ini/fuzz_test.go
+++ b/internal/ini/fuzz_test.go
@@ -1,3 +1,4 @@
+//go:build fuzz
 // +build fuzz
 
 // fuzz test data is stored in Amazon S3.
diff --git a/internal/shareddefaults/shared_config_other_test.go b/internal/shareddefaults/shared_config_other_test.go
index 7490b8848ab..fb7f60e0ff2 100644
--- a/internal/shareddefaults/shared_config_other_test.go
+++ b/internal/shareddefaults/shared_config_other_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package shareddefaults_test
diff --git a/internal/shareddefaults/shared_config_windows_test.go b/internal/shareddefaults/shared_config_windows_test.go
index 35ba385882b..49d13b13e28 100644
--- a/internal/shareddefaults/shared_config_windows_test.go
+++ b/internal/shareddefaults/shared_config_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package shareddefaults_test
diff --git a/service/internal/integrationtest/acm/smoke_test.go b/service/internal/integrationtest/acm/smoke_test.go
index 04deee4b4f7..7193df80c3a 100644
--- a/service/internal/integrationtest/acm/smoke_test.go
+++ b/service/internal/integrationtest/acm/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package acm
diff --git a/service/internal/integrationtest/apigateway/smoke_test.go b/service/internal/integrationtest/apigateway/smoke_test.go
index f6e79a15347..298dd041a67 100644
--- a/service/internal/integrationtest/apigateway/smoke_test.go
+++ b/service/internal/integrationtest/apigateway/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package apigateway
diff --git a/service/internal/integrationtest/applicationautoscaling/smoke_test.go b/service/internal/integrationtest/applicationautoscaling/smoke_test.go
index 75e6f512f8b..7c8867a5fa7 100644
--- a/service/internal/integrationtest/applicationautoscaling/smoke_test.go
+++ b/service/internal/integrationtest/applicationautoscaling/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package applicationautoscaling
diff --git a/service/internal/integrationtest/applicationdiscoveryservice/smoke_test.go b/service/internal/integrationtest/applicationdiscoveryservice/smoke_test.go
index 378477ad631..9afc76d0037 100644
--- a/service/internal/integrationtest/applicationdiscoveryservice/smoke_test.go
+++ b/service/internal/integrationtest/applicationdiscoveryservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package applicationdiscoveryservice
diff --git a/service/internal/integrationtest/appstream/smoke_test.go b/service/internal/integrationtest/appstream/smoke_test.go
index 18c0845ac99..0c07db927c1 100644
--- a/service/internal/integrationtest/appstream/smoke_test.go
+++ b/service/internal/integrationtest/appstream/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package appstream
diff --git a/service/internal/integrationtest/athena/smoke_test.go b/service/internal/integrationtest/athena/smoke_test.go
index 057dab21c0b..9bb514981cd 100644
--- a/service/internal/integrationtest/athena/smoke_test.go
+++ b/service/internal/integrationtest/athena/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package athena
diff --git a/service/internal/integrationtest/autoscaling/smoke_test.go b/service/internal/integrationtest/autoscaling/smoke_test.go
index f5cd2743997..b1fbe911012 100644
--- a/service/internal/integrationtest/autoscaling/smoke_test.go
+++ b/service/internal/integrationtest/autoscaling/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package autoscaling
diff --git a/service/internal/integrationtest/batch/smoke_test.go b/service/internal/integrationtest/batch/smoke_test.go
index 0a7a64ec7d2..bd7cc1a1dd7 100644
--- a/service/internal/integrationtest/batch/smoke_test.go
+++ b/service/internal/integrationtest/batch/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package batch
diff --git a/service/internal/integrationtest/cloudformation/smoke_test.go b/service/internal/integrationtest/cloudformation/smoke_test.go
index 4c0fb5c250f..ea12733bfe6 100644
--- a/service/internal/integrationtest/cloudformation/smoke_test.go
+++ b/service/internal/integrationtest/cloudformation/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudformation
diff --git a/service/internal/integrationtest/cloudfront/smoke_test.go b/service/internal/integrationtest/cloudfront/smoke_test.go
index bb7d7b07013..44da4c8b7e0 100644
--- a/service/internal/integrationtest/cloudfront/smoke_test.go
+++ b/service/internal/integrationtest/cloudfront/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudfront
diff --git a/service/internal/integrationtest/cloudhsmv2/smoke_test.go b/service/internal/integrationtest/cloudhsmv2/smoke_test.go
index cf7cbc864c9..2ce8a6a2e78 100644
--- a/service/internal/integrationtest/cloudhsmv2/smoke_test.go
+++ b/service/internal/integrationtest/cloudhsmv2/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudhsmv2
diff --git a/service/internal/integrationtest/cloudsearch/smoke_test.go b/service/internal/integrationtest/cloudsearch/smoke_test.go
index 77c7d5d8333..c4f1463bf0b 100644
--- a/service/internal/integrationtest/cloudsearch/smoke_test.go
+++ b/service/internal/integrationtest/cloudsearch/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudsearch
diff --git a/service/internal/integrationtest/cloudtrail/smoke_test.go b/service/internal/integrationtest/cloudtrail/smoke_test.go
index 15d10c1f314..88ac3bafc8b 100644
--- a/service/internal/integrationtest/cloudtrail/smoke_test.go
+++ b/service/internal/integrationtest/cloudtrail/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudtrail
diff --git a/service/internal/integrationtest/cloudwatch/smoke_test.go b/service/internal/integrationtest/cloudwatch/smoke_test.go
index 984b2357b6e..0c05a5e0e0f 100644
--- a/service/internal/integrationtest/cloudwatch/smoke_test.go
+++ b/service/internal/integrationtest/cloudwatch/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudwatch
diff --git a/service/internal/integrationtest/codebuild/smoke_test.go b/service/internal/integrationtest/codebuild/smoke_test.go
index d29bb2b1225..b86ef650cfb 100644
--- a/service/internal/integrationtest/codebuild/smoke_test.go
+++ b/service/internal/integrationtest/codebuild/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codebuild
diff --git a/service/internal/integrationtest/codecommit/smoke_test.go b/service/internal/integrationtest/codecommit/smoke_test.go
index d67bd5f944e..465ac5c36cd 100644
--- a/service/internal/integrationtest/codecommit/smoke_test.go
+++ b/service/internal/integrationtest/codecommit/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codecommit
diff --git a/service/internal/integrationtest/codedeploy/smoke_test.go b/service/internal/integrationtest/codedeploy/smoke_test.go
index 39c7634edeb..32e1a224760 100644
--- a/service/internal/integrationtest/codedeploy/smoke_test.go
+++ b/service/internal/integrationtest/codedeploy/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codedeploy
diff --git a/service/internal/integrationtest/codepipeline/smoke_test.go b/service/internal/integrationtest/codepipeline/smoke_test.go
index cc9e58bdb0e..264d3cb2622 100644
--- a/service/internal/integrationtest/codepipeline/smoke_test.go
+++ b/service/internal/integrationtest/codepipeline/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codepipeline
diff --git a/service/internal/integrationtest/codestar/smoke_test.go b/service/internal/integrationtest/codestar/smoke_test.go
index 377c570fc80..923575655e4 100644
--- a/service/internal/integrationtest/codestar/smoke_test.go
+++ b/service/internal/integrationtest/codestar/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codestar
diff --git a/service/internal/integrationtest/cognitoidentityprovider/smoke_test.go b/service/internal/integrationtest/cognitoidentityprovider/smoke_test.go
index 9bdf4166718..1fe3b526aff 100644
--- a/service/internal/integrationtest/cognitoidentityprovider/smoke_test.go
+++ b/service/internal/integrationtest/cognitoidentityprovider/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cognitoidentityprovider
diff --git a/service/internal/integrationtest/configservice/smoke_test.go b/service/internal/integrationtest/configservice/smoke_test.go
index 5149413bd20..2a2d70a5468 100644
--- a/service/internal/integrationtest/configservice/smoke_test.go
+++ b/service/internal/integrationtest/configservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package configservice
diff --git a/service/internal/integrationtest/costandusagereportservice/smoke_test.go b/service/internal/integrationtest/costandusagereportservice/smoke_test.go
index 7bb63c67f12..2ce738c039f 100644
--- a/service/internal/integrationtest/costandusagereportservice/smoke_test.go
+++ b/service/internal/integrationtest/costandusagereportservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package costandusagereportservice
diff --git a/service/internal/integrationtest/databasemigrationservice/smoke_test.go b/service/internal/integrationtest/databasemigrationservice/smoke_test.go
index c39722ae08e..e0de6b4c610 100644
--- a/service/internal/integrationtest/databasemigrationservice/smoke_test.go
+++ b/service/internal/integrationtest/databasemigrationservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package databasemigrationservice
diff --git a/service/internal/integrationtest/devicefarm/smoke_test.go b/service/internal/integrationtest/devicefarm/smoke_test.go
index 7ba1d9cc406..9b32e4a7278 100644
--- a/service/internal/integrationtest/devicefarm/smoke_test.go
+++ b/service/internal/integrationtest/devicefarm/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package devicefarm
diff --git a/service/internal/integrationtest/directconnect/smoke_test.go b/service/internal/integrationtest/directconnect/smoke_test.go
index 465b9073c2b..df06c769802 100644
--- a/service/internal/integrationtest/directconnect/smoke_test.go
+++ b/service/internal/integrationtest/directconnect/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package directconnect
diff --git a/service/internal/integrationtest/directoryservice/smoke_test.go b/service/internal/integrationtest/directoryservice/smoke_test.go
index bebb72def04..18e6ec49b60 100644
--- a/service/internal/integrationtest/directoryservice/smoke_test.go
+++ b/service/internal/integrationtest/directoryservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package directoryservice
diff --git a/service/internal/integrationtest/docdb/smoke_test.go b/service/internal/integrationtest/docdb/smoke_test.go
index d5c0dca0e80..6caf06bbb06 100644
--- a/service/internal/integrationtest/docdb/smoke_test.go
+++ b/service/internal/integrationtest/docdb/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package docdb
diff --git a/service/internal/integrationtest/dynamodb/smoke_test.go b/service/internal/integrationtest/dynamodb/smoke_test.go
index 62a498791da..c58e2a698ef 100644
--- a/service/internal/integrationtest/dynamodb/smoke_test.go
+++ b/service/internal/integrationtest/dynamodb/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package dynamodb
diff --git a/service/internal/integrationtest/ec2/smoke_test.go b/service/internal/integrationtest/ec2/smoke_test.go
index c35106d0ed4..0117911e679 100644
--- a/service/internal/integrationtest/ec2/smoke_test.go
+++ b/service/internal/integrationtest/ec2/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package ec2
diff --git a/service/internal/integrationtest/ecr/smoke_test.go b/service/internal/integrationtest/ecr/smoke_test.go
index 8bccbda55a7..c05b9557261 100644
--- a/service/internal/integrationtest/ecr/smoke_test.go
+++ b/service/internal/integrationtest/ecr/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package ecr
diff --git a/service/internal/integrationtest/ecs/smoke_test.go b/service/internal/integrationtest/ecs/smoke_test.go
index b426808adc9..1485ce8baca 100644
--- a/service/internal/integrationtest/ecs/smoke_test.go
+++ b/service/internal/integrationtest/ecs/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package ecs
diff --git a/service/internal/integrationtest/efs/smoke_test.go b/service/internal/integrationtest/efs/smoke_test.go
index 6f067a1f7eb..3bb32e99dca 100644
--- a/service/internal/integrationtest/efs/smoke_test.go
+++ b/service/internal/integrationtest/efs/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package efs
diff --git a/service/internal/integrationtest/elasticache/smoke_test.go b/service/internal/integrationtest/elasticache/smoke_test.go
index cc5d9008091..2b2c12438be 100644
--- a/service/internal/integrationtest/elasticache/smoke_test.go
+++ b/service/internal/integrationtest/elasticache/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package elasticache
diff --git a/service/internal/integrationtest/elasticbeanstalk/smoke_test.go b/service/internal/integrationtest/elasticbeanstalk/smoke_test.go
index 7cf37371653..403a170b498 100644
--- a/service/internal/integrationtest/elasticbeanstalk/smoke_test.go
+++ b/service/internal/integrationtest/elasticbeanstalk/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package elasticbeanstalk
diff --git a/service/internal/integrationtest/elasticloadbalancing/smoke_test.go b/service/internal/integrationtest/elasticloadbalancing/smoke_test.go
index 0dd9b6cdaa8..69484168ed3 100644
--- a/service/internal/integrationtest/elasticloadbalancing/smoke_test.go
+++ b/service/internal/integrationtest/elasticloadbalancing/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package elasticloadbalancing
diff --git a/service/internal/integrationtest/elasticsearchservice/smoke_test.go b/service/internal/integrationtest/elasticsearchservice/smoke_test.go
index dc0e74dbf87..a5e9d562a24 100644
--- a/service/internal/integrationtest/elasticsearchservice/smoke_test.go
+++ b/service/internal/integrationtest/elasticsearchservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package elasticsearchservice
diff --git a/service/internal/integrationtest/elastictranscoder/smoke_test.go b/service/internal/integrationtest/elastictranscoder/smoke_test.go
index 92e56624bd9..a5722513922 100644
--- a/service/internal/integrationtest/elastictranscoder/smoke_test.go
+++ b/service/internal/integrationtest/elastictranscoder/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package elastictranscoder
diff --git a/service/internal/integrationtest/elbv2/smoke_test.go b/service/internal/integrationtest/elbv2/smoke_test.go
index 0a808c6adf5..e048a9155aa 100644
--- a/service/internal/integrationtest/elbv2/smoke_test.go
+++ b/service/internal/integrationtest/elbv2/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package elasticloadbalancingv2
diff --git a/service/internal/integrationtest/emr/smoke_test.go b/service/internal/integrationtest/emr/smoke_test.go
index ab3d9e87c7d..a0b4283c185 100644
--- a/service/internal/integrationtest/emr/smoke_test.go
+++ b/service/internal/integrationtest/emr/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package emr
diff --git a/service/internal/integrationtest/eventbridge/smoke_test.go b/service/internal/integrationtest/eventbridge/smoke_test.go
index a90a17cd512..739eae47fc0 100644
--- a/service/internal/integrationtest/eventbridge/smoke_test.go
+++ b/service/internal/integrationtest/eventbridge/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package eventbridge
diff --git a/service/internal/integrationtest/firehose/smoke_test.go b/service/internal/integrationtest/firehose/smoke_test.go
index 053136b0579..e9861e234ff 100644
--- a/service/internal/integrationtest/firehose/smoke_test.go
+++ b/service/internal/integrationtest/firehose/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package firehose
diff --git a/service/internal/integrationtest/gamelift/smoke_test.go b/service/internal/integrationtest/gamelift/smoke_test.go
index 1c4748f9245..fb758145192 100644
--- a/service/internal/integrationtest/gamelift/smoke_test.go
+++ b/service/internal/integrationtest/gamelift/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package gamelift
diff --git a/service/internal/integrationtest/glacier/smoke_test.go b/service/internal/integrationtest/glacier/smoke_test.go
index 1e309dcd636..ffe53b8dd6b 100644
--- a/service/internal/integrationtest/glacier/smoke_test.go
+++ b/service/internal/integrationtest/glacier/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package glacier
diff --git a/service/internal/integrationtest/glue/smoke_test.go b/service/internal/integrationtest/glue/smoke_test.go
index 9da9682729b..ab2b54ae5cb 100644
--- a/service/internal/integrationtest/glue/smoke_test.go
+++ b/service/internal/integrationtest/glue/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package glue
diff --git a/service/internal/integrationtest/health/smoke_test.go b/service/internal/integrationtest/health/smoke_test.go
index d57eee779ab..3a782f71bf6 100644
--- a/service/internal/integrationtest/health/smoke_test.go
+++ b/service/internal/integrationtest/health/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package health
diff --git a/service/internal/integrationtest/iam/smoke_test.go b/service/internal/integrationtest/iam/smoke_test.go
index 910e7092e52..90f1b0afc43 100644
--- a/service/internal/integrationtest/iam/smoke_test.go
+++ b/service/internal/integrationtest/iam/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package iam
diff --git a/service/internal/integrationtest/inspector/smoke_test.go b/service/internal/integrationtest/inspector/smoke_test.go
index b1dd5d29085..102189c5cd9 100644
--- a/service/internal/integrationtest/inspector/smoke_test.go
+++ b/service/internal/integrationtest/inspector/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package inspector
diff --git a/service/internal/integrationtest/iot/smoke_test.go b/service/internal/integrationtest/iot/smoke_test.go
index 14230c353a3..24b2e7d6033 100644
--- a/service/internal/integrationtest/iot/smoke_test.go
+++ b/service/internal/integrationtest/iot/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package iot
diff --git a/service/internal/integrationtest/kinesis/smoke_test.go b/service/internal/integrationtest/kinesis/smoke_test.go
index 17d5455af45..e9bf3ffb2a3 100644
--- a/service/internal/integrationtest/kinesis/smoke_test.go
+++ b/service/internal/integrationtest/kinesis/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package kinesis
diff --git a/service/internal/integrationtest/kms/smoke_test.go b/service/internal/integrationtest/kms/smoke_test.go
index e37d3bc5ec9..1d49d8d436b 100644
--- a/service/internal/integrationtest/kms/smoke_test.go
+++ b/service/internal/integrationtest/kms/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package kms
diff --git a/service/internal/integrationtest/lambda/smoke_test.go b/service/internal/integrationtest/lambda/smoke_test.go
index 85059907c15..77bec927c86 100644
--- a/service/internal/integrationtest/lambda/smoke_test.go
+++ b/service/internal/integrationtest/lambda/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package lambda
diff --git a/service/internal/integrationtest/lightsail/smoke_test.go b/service/internal/integrationtest/lightsail/smoke_test.go
index 051c6f98f3f..f2cfb7c51f3 100644
--- a/service/internal/integrationtest/lightsail/smoke_test.go
+++ b/service/internal/integrationtest/lightsail/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package lightsail
diff --git a/service/internal/integrationtest/marketplacecommerceanalytics/smoke_test.go b/service/internal/integrationtest/marketplacecommerceanalytics/smoke_test.go
index 77181aee11e..43afb4cc32b 100644
--- a/service/internal/integrationtest/marketplacecommerceanalytics/smoke_test.go
+++ b/service/internal/integrationtest/marketplacecommerceanalytics/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package marketplacecommerceanalytics
diff --git a/service/internal/integrationtest/neptune/smoke_test.go b/service/internal/integrationtest/neptune/smoke_test.go
index a1ce3274f90..63c526039aa 100644
--- a/service/internal/integrationtest/neptune/smoke_test.go
+++ b/service/internal/integrationtest/neptune/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package neptune
diff --git a/service/internal/integrationtest/opsworks/smoke_test.go b/service/internal/integrationtest/opsworks/smoke_test.go
index b3b0de49dd4..862520400f1 100644
--- a/service/internal/integrationtest/opsworks/smoke_test.go
+++ b/service/internal/integrationtest/opsworks/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package opsworks
diff --git a/service/internal/integrationtest/pinpointemail/smoke_test.go b/service/internal/integrationtest/pinpointemail/smoke_test.go
index 6fd4eb3245d..a5fe118646e 100644
--- a/service/internal/integrationtest/pinpointemail/smoke_test.go
+++ b/service/internal/integrationtest/pinpointemail/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package pinpointemail
diff --git a/service/internal/integrationtest/polly/smoke_test.go b/service/internal/integrationtest/polly/smoke_test.go
index 6905c512a7e..3d84c1de056 100644
--- a/service/internal/integrationtest/polly/smoke_test.go
+++ b/service/internal/integrationtest/polly/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package polly
diff --git a/service/internal/integrationtest/rds/smoke_test.go b/service/internal/integrationtest/rds/smoke_test.go
index e3ec5132f78..1305d691f82 100644
--- a/service/internal/integrationtest/rds/smoke_test.go
+++ b/service/internal/integrationtest/rds/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package rds
diff --git a/service/internal/integrationtest/redshift/smoke_test.go b/service/internal/integrationtest/redshift/smoke_test.go
index fc13b8957ef..0bbd88633ba 100644
--- a/service/internal/integrationtest/redshift/smoke_test.go
+++ b/service/internal/integrationtest/redshift/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package redshift
diff --git a/service/internal/integrationtest/rekognition/smoke_test.go b/service/internal/integrationtest/rekognition/smoke_test.go
index 234a7b721ea..3a9670734cb 100644
--- a/service/internal/integrationtest/rekognition/smoke_test.go
+++ b/service/internal/integrationtest/rekognition/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package rekognition
diff --git a/service/internal/integrationtest/route53/smoke_test.go b/service/internal/integrationtest/route53/smoke_test.go
index f4da99edde1..0f66ff9b931 100644
--- a/service/internal/integrationtest/route53/smoke_test.go
+++ b/service/internal/integrationtest/route53/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package route53
diff --git a/service/internal/integrationtest/route53domains/smoke_test.go b/service/internal/integrationtest/route53domains/smoke_test.go
index dba4b339ce8..bff198d788b 100644
--- a/service/internal/integrationtest/route53domains/smoke_test.go
+++ b/service/internal/integrationtest/route53domains/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package route53domains
diff --git a/service/internal/integrationtest/route53resolver/smoke_test.go b/service/internal/integrationtest/route53resolver/smoke_test.go
index b98cda40016..3b16aff7e0c 100644
--- a/service/internal/integrationtest/route53resolver/smoke_test.go
+++ b/service/internal/integrationtest/route53resolver/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package route53resolver
diff --git a/service/internal/integrationtest/s3/api_test.go b/service/internal/integrationtest/s3/api_test.go
index 764d3663490..7a2133a1804 100644
--- a/service/internal/integrationtest/s3/api_test.go
+++ b/service/internal/integrationtest/s3/api_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3
diff --git a/service/internal/integrationtest/s3/endpoint_test.go b/service/internal/integrationtest/s3/endpoint_test.go
index 404a3273fad..dd91f79066e 100644
--- a/service/internal/integrationtest/s3/endpoint_test.go
+++ b/service/internal/integrationtest/s3/endpoint_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3
diff --git a/service/internal/integrationtest/s3/get_object_acl_test.go b/service/internal/integrationtest/s3/get_object_acl_test.go
index fd804fc8c34..0f7c47b909d 100644
--- a/service/internal/integrationtest/s3/get_object_acl_test.go
+++ b/service/internal/integrationtest/s3/get_object_acl_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3
diff --git a/service/internal/integrationtest/s3/presign_test.go b/service/internal/integrationtest/s3/presign_test.go
index ddbba6d3c87..bd1280e0f2b 100644
--- a/service/internal/integrationtest/s3/presign_test.go
+++ b/service/internal/integrationtest/s3/presign_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3
diff --git a/service/internal/integrationtest/s3/setup_test.go b/service/internal/integrationtest/s3/setup_test.go
index 8755dde43bc..4ce1237ba69 100644
--- a/service/internal/integrationtest/s3/setup_test.go
+++ b/service/internal/integrationtest/s3/setup_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3
diff --git a/service/internal/integrationtest/s3/smoke_test.go b/service/internal/integrationtest/s3/smoke_test.go
index dfc0d333a9d..875208b17d4 100644
--- a/service/internal/integrationtest/s3/smoke_test.go
+++ b/service/internal/integrationtest/s3/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3
diff --git a/service/internal/integrationtest/s3control/api_test.go b/service/internal/integrationtest/s3control/api_test.go
index 2b2bae1deb8..900980ed7f1 100644
--- a/service/internal/integrationtest/s3control/api_test.go
+++ b/service/internal/integrationtest/s3control/api_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3control
diff --git a/service/internal/integrationtest/s3control/setup_test.go b/service/internal/integrationtest/s3control/setup_test.go
index 83c3211bb88..14e20fd25d1 100644
--- a/service/internal/integrationtest/s3control/setup_test.go
+++ b/service/internal/integrationtest/s3control/setup_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3control
diff --git a/service/internal/integrationtest/s3shared/integ_test_setup.go b/service/internal/integrationtest/s3shared/integ_test_setup.go
index 43799513291..fd839c5dff0 100644
--- a/service/internal/integrationtest/s3shared/integ_test_setup.go
+++ b/service/internal/integrationtest/s3shared/integ_test_setup.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package s3shared
diff --git a/service/internal/integrationtest/secretsmanager/smoke_test.go b/service/internal/integrationtest/secretsmanager/smoke_test.go
index 9f0c8139cf7..9e252bcf4c9 100644
--- a/service/internal/integrationtest/secretsmanager/smoke_test.go
+++ b/service/internal/integrationtest/secretsmanager/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package secretsmanager
diff --git a/service/internal/integrationtest/servicecatalog/smoke_test.go b/service/internal/integrationtest/servicecatalog/smoke_test.go
index ec6a9c190a4..fb68bb49c7b 100644
--- a/service/internal/integrationtest/servicecatalog/smoke_test.go
+++ b/service/internal/integrationtest/servicecatalog/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package servicecatalog
diff --git a/service/internal/integrationtest/ses/smoke_test.go b/service/internal/integrationtest/ses/smoke_test.go
index f27615cc34d..de060de0484 100644
--- a/service/internal/integrationtest/ses/smoke_test.go
+++ b/service/internal/integrationtest/ses/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package ses
diff --git a/service/internal/integrationtest/sfn/smoke_test.go b/service/internal/integrationtest/sfn/smoke_test.go
index 6fe80a99add..bf26ce00f6a 100644
--- a/service/internal/integrationtest/sfn/smoke_test.go
+++ b/service/internal/integrationtest/sfn/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sfn
diff --git a/service/internal/integrationtest/shield/smoke_test.go b/service/internal/integrationtest/shield/smoke_test.go
index dbba5aaef55..ecc77fce86f 100644
--- a/service/internal/integrationtest/shield/smoke_test.go
+++ b/service/internal/integrationtest/shield/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package shield
diff --git a/service/internal/integrationtest/sms/smoke_test.go b/service/internal/integrationtest/sms/smoke_test.go
index 760ccc08f51..2f7ef667d32 100644
--- a/service/internal/integrationtest/sms/smoke_test.go
+++ b/service/internal/integrationtest/sms/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sms
diff --git a/service/internal/integrationtest/snowball/smoke_test.go b/service/internal/integrationtest/snowball/smoke_test.go
index 9166993cd65..79dd1141dd4 100644
--- a/service/internal/integrationtest/snowball/smoke_test.go
+++ b/service/internal/integrationtest/snowball/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package snowball
diff --git a/service/internal/integrationtest/sns/smoke_test.go b/service/internal/integrationtest/sns/smoke_test.go
index 63568966fd5..6e5d0f6eb76 100644
--- a/service/internal/integrationtest/sns/smoke_test.go
+++ b/service/internal/integrationtest/sns/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sns
diff --git a/service/internal/integrationtest/sqs/smoke_test.go b/service/internal/integrationtest/sqs/smoke_test.go
index 1691ab0f16c..e6e39c73b2d 100644
--- a/service/internal/integrationtest/sqs/smoke_test.go
+++ b/service/internal/integrationtest/sqs/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sqs
diff --git a/service/internal/integrationtest/ssm/smoke_test.go b/service/internal/integrationtest/ssm/smoke_test.go
index 9a13bcb9741..50ffbe8337b 100644
--- a/service/internal/integrationtest/ssm/smoke_test.go
+++ b/service/internal/integrationtest/ssm/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package ssm
diff --git a/service/internal/integrationtest/sts/smoke_test.go b/service/internal/integrationtest/sts/smoke_test.go
index 3db0c5fa3e2..d6183d7411b 100644
--- a/service/internal/integrationtest/sts/smoke_test.go
+++ b/service/internal/integrationtest/sts/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package sts
diff --git a/service/internal/integrationtest/support/smoke_test.go b/service/internal/integrationtest/support/smoke_test.go
index 1568cbf3756..028c85332db 100644
--- a/service/internal/integrationtest/support/smoke_test.go
+++ b/service/internal/integrationtest/support/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package support
diff --git a/service/internal/integrationtest/timestreamwrite/smoke_test.go b/service/internal/integrationtest/timestreamwrite/smoke_test.go
index 0e9b69ff54a..1662d31f1e2 100644
--- a/service/internal/integrationtest/timestreamwrite/smoke_test.go
+++ b/service/internal/integrationtest/timestreamwrite/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package timestreamwrite
diff --git a/service/internal/integrationtest/waf/smoke_test.go b/service/internal/integrationtest/waf/smoke_test.go
index cdbebae18c0..2ba327faa77 100644
--- a/service/internal/integrationtest/waf/smoke_test.go
+++ b/service/internal/integrationtest/waf/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package waf
diff --git a/service/internal/integrationtest/wafregional/smoke_test.go b/service/internal/integrationtest/wafregional/smoke_test.go
index 28f1e57ded9..7ab3b0e5b14 100644
--- a/service/internal/integrationtest/wafregional/smoke_test.go
+++ b/service/internal/integrationtest/wafregional/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package wafregional
diff --git a/service/internal/integrationtest/wafv2/smoke_test.go b/service/internal/integrationtest/wafv2/smoke_test.go
index f761c9de840..22d2515a04b 100644
--- a/service/internal/integrationtest/wafv2/smoke_test.go
+++ b/service/internal/integrationtest/wafv2/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package wafv2
diff --git a/service/internal/integrationtest/workspaces/smoke_test.go b/service/internal/integrationtest/workspaces/smoke_test.go
index 5bab9fcfb90..a3c29476d0f 100644
--- a/service/internal/integrationtest/workspaces/smoke_test.go
+++ b/service/internal/integrationtest/workspaces/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package workspaces