diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml b/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml
index 3e702056f79e..b4ececaaaf9f 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml
@@ -10,22 +10,22 @@ stages:
         - template: ../variables/globals.yml
       strategy:
         matrix:
-          Linux_Go115:
+          Linux_Go117:
             pool.name: azsdk-pool-mms-ubuntu-2004-general
             image.name: MMSUbuntu20.04
-            go.version: '1.15'
-          Windows_Go115:
+            go.version: '1.17'
+          Windows_Go117:
             pool.name: azsdk-pool-mms-win-2019-general
             image.name: MMS2019
-            go.version: '1.15'
-          Linux_Go114:
+            go.version: '1.17'
+          Linux_Go116:
             pool.name: azsdk-pool-mms-ubuntu-2004-general
             image.name: MMSUbuntu20.04
-            go.version: '1.14'
-          Windows_Go114:
+            go.version: '1.16.7'
+          Windows_Go116:
             pool.name: azsdk-pool-mms-win-2019-general
             image.name: MMS2019
-            go.version: '1.14'
+            go.version: '1.16.7'
       pool:
         name: $(pool.name)
         vmImage: $(image.name)
@@ -64,7 +64,7 @@ stages:
       steps:
       - task: GoTool@0
         inputs:
-          version: '1.15'
+          version: '1.17'
         displayName: "Select Go Version"
 
       - template: ../steps/create-go-workspace.yml
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 64c2c88cc33a..747b2005309f 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -12,22 +12,22 @@ stages:
         - template: ../variables/globals.yml
       strategy:
         matrix:
-          Linux_Go115:
+          Linux_Go117:
             pool.name: azsdk-pool-mms-ubuntu-2004-general
             image.name: MMSUbuntu20.04
-            go.version: '1.15'
-          Windows_Go115:
+            go.version: '1.17'
+          Windows_Go117:
             pool.name: azsdk-pool-mms-win-2019-general
             image.name: MMS2019
-            go.version: '1.15'
-          Linux_Go114:
+            go.version: '1.17'
+          Linux_Go116:
             pool.name: azsdk-pool-mms-ubuntu-2004-general
             image.name: MMSUbuntu20.04
-            go.version: '1.14'
-          Windows_Go114:
+            go.version: '1.16.7'
+          Windows_Go116:
             pool.name: azsdk-pool-mms-win-2019-general
             image.name: MMS2019
-            go.version: '1.14'
+            go.version: '1.16.7'
       pool:
         name: $(pool.name)
         vmImage: $(image.name)
@@ -68,7 +68,7 @@ stages:
       steps:
       - task: GoTool@0
         inputs:
-          version: '1.15'
+          version: '1.17'
         displayName: "Select Go Version"
 
       - template: ../steps/create-go-workspace.yml
diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml
index 5b9f89b0b6f2..6a79c86628e2 100644
--- a/eng/pipelines/templates/steps/build-test.yml
+++ b/eng/pipelines/templates/steps/build-test.yml
@@ -57,7 +57,7 @@ steps:
       condition: succeededOrFailed()
       inputs:
         testRunner: JUnit
-        testResultsFiles: '${{parameters.GoWorkspace}}sdk/**/report.xml'
+        testResultsFiles: '${{parameters.GoWorkspace}}sdk/${{parameters.ServiceDirectory}}/report.xml'
         testRunTitle: 'Go ${{ parameters.GoVersion }} on ${{ parameters.Image }}'
         failTaskOnFailedTests: true
 
@@ -65,6 +65,6 @@ steps:
       condition: succeededOrFailed()
       inputs:
         codeCoverageTool: Cobertura
-        summaryFileLocation: '${{parameters.GoWorkspace}}sdk/coverage.xml'
-        additionalCodeCoverageFiles: '${{parameters.GoWorkspace}}sdk/coverage.html'
+        summaryFileLocation: '${{parameters.GoWorkspace}}sdk/${{parameters.ServiceDirectory}}/coverage.xml'
+        additionalCodeCoverageFiles: '${{parameters.GoWorkspace}}sdk/${{parameters.ServiceDirectory}}/coverage.html'
         failIfCoverageEmpty: true
diff --git a/eng/scripts/create_coverage.ps1 b/eng/scripts/create_coverage.ps1
index 6181a21b6855..36551259aeb1 100644
--- a/eng/scripts/create_coverage.ps1
+++ b/eng/scripts/create_coverage.ps1
@@ -5,6 +5,7 @@ Param(
 )
 
 Write-Host $serviceDirectory
+Push-Location $serviceDirectory
 
 $coverageFiles = [Collections.Generic.List[String]]@()
 Get-ChildItem -recurse -path . -filter coverage.txt | ForEach-Object {
@@ -22,4 +23,5 @@ Get-Content ./coverage.json | gocov-xml > ./coverage.xml
 Get-Content ./coverage.json | gocov-html > ./coverage.html
 
 # use internal tool to fail if coverage is too low
+Pop-Location
 go run ../tools/internal/coverage/main.go  -serviceDirectory $serviceDirectory
\ No newline at end of file
diff --git a/sdk/azcore/core.go b/sdk/azcore/core.go
index e02bd3e1a81b..cfd2ede845ef 100644
--- a/sdk/azcore/core.go
+++ b/sdk/azcore/core.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/core_test.go b/sdk/azcore/core_test.go
index 7c7b9da6255d..d866eb46177d 100644
--- a/sdk/azcore/core_test.go
+++ b/sdk/azcore/core_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/credential.go b/sdk/azcore/credential.go
index 9d08e6dbb350..441f3d0bc37c 100644
--- a/sdk/azcore/credential.go
+++ b/sdk/azcore/credential.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/doc.go b/sdk/azcore/doc.go
index c4ae259c0d49..a90b6e542c23 100644
--- a/sdk/azcore/doc.go
+++ b/sdk/azcore/doc.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/error.go b/sdk/azcore/error.go
index 97ac16831a50..e2547faf808c 100644
--- a/sdk/azcore/error.go
+++ b/sdk/azcore/error.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/etag.go b/sdk/azcore/etag.go
index 983af5b6524b..d862501cea9c 100644
--- a/sdk/azcore/etag.go
+++ b/sdk/azcore/etag.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/etag_test.go b/sdk/azcore/etag_test.go
index 5541fe05a20a..b291536a17b0 100644
--- a/sdk/azcore/etag_test.go
+++ b/sdk/azcore/etag_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/example_test.go b/sdk/azcore/example_test.go
index 4a0118ed82df..0506a3f75bac 100644
--- a/sdk/azcore/example_test.go
+++ b/sdk/azcore/example_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright 2017 Microsoft Corporation. All rights reserved.
 // Use of this source code is governed by an MIT
diff --git a/sdk/azcore/go.mod b/sdk/azcore/go.mod
index efc9975045f7..f5c6b8a881fc 100644
--- a/sdk/azcore/go.mod
+++ b/sdk/azcore/go.mod
@@ -6,4 +6,4 @@ require (
 	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b
 )
 
-go 1.14
+go 1.16
diff --git a/sdk/azcore/log/log.go b/sdk/azcore/log/log.go
index 55603dd369bf..c18a225bf244 100644
--- a/sdk/azcore/log/log.go
+++ b/sdk/azcore/log/log.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/log/log_test.go b/sdk/azcore/log/log_test.go
index deea62a1e9ac..772008195aec 100644
--- a/sdk/azcore/log/log_test.go
+++ b/sdk/azcore/log/log_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_anonymous_credential.go b/sdk/azcore/policy_anonymous_credential.go
index c767a6370af9..496b976f561c 100644
--- a/sdk/azcore/policy_anonymous_credential.go
+++ b/sdk/azcore/policy_anonymous_credential.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_anonymous_credential_test.go b/sdk/azcore/policy_anonymous_credential_test.go
index 9effb7569ae8..e625470dbcf7 100644
--- a/sdk/azcore/policy_anonymous_credential_test.go
+++ b/sdk/azcore/policy_anonymous_credential_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_body_download.go b/sdk/azcore/policy_body_download.go
index 2c9527235bc3..8724b11f10b8 100644
--- a/sdk/azcore/policy_body_download.go
+++ b/sdk/azcore/policy_body_download.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_body_download_test.go b/sdk/azcore/policy_body_download_test.go
index dff5e5a6379a..a7387cbedd4f 100644
--- a/sdk/azcore/policy_body_download_test.go
+++ b/sdk/azcore/policy_body_download_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_http_header.go b/sdk/azcore/policy_http_header.go
index dbdde42bd950..ba7650280d9f 100644
--- a/sdk/azcore/policy_http_header.go
+++ b/sdk/azcore/policy_http_header.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_http_header_test.go b/sdk/azcore/policy_http_header_test.go
index cff96ad02458..ededd5955d17 100644
--- a/sdk/azcore/policy_http_header_test.go
+++ b/sdk/azcore/policy_http_header_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_logging.go b/sdk/azcore/policy_logging.go
index 35291b63c906..b97189f3757b 100644
--- a/sdk/azcore/policy_logging.go
+++ b/sdk/azcore/policy_logging.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_logging_test.go b/sdk/azcore/policy_logging_test.go
index cd7272b359dc..6524ae978ce9 100644
--- a/sdk/azcore/policy_logging_test.go
+++ b/sdk/azcore/policy_logging_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_retry.go b/sdk/azcore/policy_retry.go
index f7ed396c7bc0..24fb07dce08f 100644
--- a/sdk/azcore/policy_retry.go
+++ b/sdk/azcore/policy_retry.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_retry_test.go b/sdk/azcore/policy_retry_test.go
index 871bc1cdc5a0..f7ab18e4c556 100644
--- a/sdk/azcore/policy_retry_test.go
+++ b/sdk/azcore/policy_retry_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_telemetry.go b/sdk/azcore/policy_telemetry.go
index b013785d3c2b..a3b0bc09eace 100644
--- a/sdk/azcore/policy_telemetry.go
+++ b/sdk/azcore/policy_telemetry.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/policy_telemetry_test.go b/sdk/azcore/policy_telemetry_test.go
index f5fcd2343855..6149eadae55f 100644
--- a/sdk/azcore/policy_telemetry_test.go
+++ b/sdk/azcore/policy_telemetry_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/poller.go b/sdk/azcore/poller.go
index db8d18219c82..340cb0859084 100644
--- a/sdk/azcore/poller.go
+++ b/sdk/azcore/poller.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/poller_test.go b/sdk/azcore/poller_test.go
index c2e46b9e3877..ef1ef814fcf2 100644
--- a/sdk/azcore/poller_test.go
+++ b/sdk/azcore/poller_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/progress.go b/sdk/azcore/progress.go
index 40e74a6bb3e0..cfdd2bf1d902 100644
--- a/sdk/azcore/progress.go
+++ b/sdk/azcore/progress.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/progress_test.go b/sdk/azcore/progress_test.go
index 945822df1e4f..bcf6e7abde14 100644
--- a/sdk/azcore/progress_test.go
+++ b/sdk/azcore/progress_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/request.go b/sdk/azcore/request.go
index 9f28b6a69d93..a3074596a2f8 100644
--- a/sdk/azcore/request.go
+++ b/sdk/azcore/request.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/request_test.go b/sdk/azcore/request_test.go
index 88168051b36e..98c80e7c795e 100644
--- a/sdk/azcore/request_test.go
+++ b/sdk/azcore/request_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/response.go b/sdk/azcore/response.go
index c765a61afe3b..59cb195c417f 100644
--- a/sdk/azcore/response.go
+++ b/sdk/azcore/response.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/response_test.go b/sdk/azcore/response_test.go
index 4f93f16b8063..9e325fa048bc 100644
--- a/sdk/azcore/response_test.go
+++ b/sdk/azcore/response_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/transport_default_http_client.go b/sdk/azcore/transport_default_http_client.go
index aac53efee102..02a36bcbe741 100644
--- a/sdk/azcore/transport_default_http_client.go
+++ b/sdk/azcore/transport_default_http_client.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/azcore/version.go b/sdk/azcore/version.go
index 646e0b198176..2220616518bc 100644
--- a/sdk/azcore/version.go
+++ b/sdk/azcore/version.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/atomic/atomic.go b/sdk/internal/atomic/atomic.go
index 781dbeca94af..c94606031fbd 100644
--- a/sdk/internal/atomic/atomic.go
+++ b/sdk/internal/atomic/atomic.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/diag/diag.go b/sdk/internal/diag/diag.go
index 332ee7d754d4..aa1ffa5834ab 100644
--- a/sdk/internal/diag/diag.go
+++ b/sdk/internal/diag/diag.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/diag/diag_test.go b/sdk/internal/diag/diag_test.go
index 7aa91ddaf908..1f5f8e42ba23 100644
--- a/sdk/internal/diag/diag_test.go
+++ b/sdk/internal/diag/diag_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/errorinfo/errorinfo.go b/sdk/internal/errorinfo/errorinfo.go
index a4f608036bad..9ba0a83f1da3 100644
--- a/sdk/internal/errorinfo/errorinfo.go
+++ b/sdk/internal/errorinfo/errorinfo.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/go.mod b/sdk/internal/go.mod
index 5a5a2fb7eb04..324d1f533a84 100644
--- a/sdk/internal/go.mod
+++ b/sdk/internal/go.mod
@@ -1,6 +1,6 @@
 module github.com/Azure/azure-sdk-for-go/sdk/internal
 
-go 1.14
+go 1.16
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/sdk/internal/log/log.go b/sdk/internal/log/log.go
index e101ea817883..cdd57980f2f7 100644
--- a/sdk/internal/log/log.go
+++ b/sdk/internal/log/log.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/mock/mock.go b/sdk/internal/mock/mock.go
index 818bd5933ad2..fe30948197ee 100644
--- a/sdk/internal/mock/mock.go
+++ b/sdk/internal/mock/mock.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/mock/mock_test.go b/sdk/internal/mock/mock_test.go
index 3838ab0db54f..d1ebdc30309a 100644
--- a/sdk/internal/mock/mock_test.go
+++ b/sdk/internal/mock/mock_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/recording/recording.go b/sdk/internal/recording/recording.go
index 3dbe4012226d..9d2d608a219b 100644
--- a/sdk/internal/recording/recording.go
+++ b/sdk/internal/recording/recording.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/recording/recording_test.go b/sdk/internal/recording/recording_test.go
index 6a2b7992bc6a..d1e83c54da4b 100644
--- a/sdk/internal/recording/recording_test.go
+++ b/sdk/internal/recording/recording_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/recording/request_matcher.go b/sdk/internal/recording/request_matcher.go
index 1065b807c324..3ff392b955f0 100644
--- a/sdk/internal/recording/request_matcher.go
+++ b/sdk/internal/recording/request_matcher.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/recording/request_matcher_test.go b/sdk/internal/recording/request_matcher_test.go
index d9027c2fce59..8a90f815e94e 100644
--- a/sdk/internal/recording/request_matcher_test.go
+++ b/sdk/internal/recording/request_matcher_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/recording/sanitizer.go b/sdk/internal/recording/sanitizer.go
index 6012d2fabaa6..2d86d0021e77 100644
--- a/sdk/internal/recording/sanitizer.go
+++ b/sdk/internal/recording/sanitizer.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/recording/sanitizer_test.go b/sdk/internal/recording/sanitizer_test.go
index bd499df9926b..f4e6c5d7ff72 100644
--- a/sdk/internal/recording/sanitizer_test.go
+++ b/sdk/internal/recording/sanitizer_test.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/recording/testcontext.go b/sdk/internal/recording/testcontext.go
index a119344b07ac..cc5922abdd8c 100644
--- a/sdk/internal/recording/testcontext.go
+++ b/sdk/internal/recording/testcontext.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
diff --git a/sdk/internal/uuid/uuid.go b/sdk/internal/uuid/uuid.go
index 0b89c699ec56..6829583e9844 100644
--- a/sdk/internal/uuid/uuid.go
+++ b/sdk/internal/uuid/uuid.go
@@ -1,4 +1,5 @@
-// +build go1.13
+//go:build go1.16
+// +build go1.16
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.