diff --git a/.github/workflows/validation.yaml b/.github/workflows/validation.yaml
index 4da2ebc..c09333e 100644
--- a/.github/workflows/validation.yaml
+++ b/.github/workflows/validation.yaml
@@ -41,7 +41,7 @@ jobs:
           go vet ./...
       - name: Test
         run: |
-          go test ./... -coverprofile coverage.out -covermode count
+          go test ./... -coverprofile coverage.out -covermode count -tags=unit
           go tool cover -func coverage.out
       - name: Build Integration Tests
         run: |
diff --git a/NOTICE.md b/NOTICE.md
index 893f732..5b73c80 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -160,18 +160,18 @@ golang.org/x/sync (v0.0.0-20210220032951-036812b2e83c)
 * Project: https://pkg.go.dev/golang.org/x/sync
 * Source:  https://github.com/golang/sync/tree/036812b2e83c0ddf193dd5a34e034151da389d09
 
+golang.org/x/text (v0.7.0)
+
+* License: BSD 3-Clause "New" or "Revised" License
+* Project: https://pkg.go.dev/golang.org/x/text
+* Source:  https://github.com/golang/text/tree/v0.7.0
+
 azure-sdk-for-go/sdk/azcore (0.20.0)
 
 * License: MIT License
 * Project: https://github.com/Azure/azure-sdk-for-go/tree/main/sdk/azcore
 * Source:  https://github.com/Azure/azure-sdk-for-go/tree/sdk/azcore/v0.20.0/sdk/azcore
 
-azure-sdk-for-go/sdk/azidentity (0.12.0)
-
-* License: MIT License
-* Project: https://github.com/Azure/azure-sdk-for-go/tree/main/sdk/azidentity
-* Source:  https://github.com/Azure/azure-sdk-for-go/tree/sdk/azidentity/v0.12.0/sdk/azidentity
-
 azure-sdk-for-go/sdk/internal (0.8.1)
 
 * License: MIT License
diff --git a/client/fileupload_test.go b/client/fileupload_test.go
index 3151c80..ecf92e7 100644
--- a/client/fileupload_test.go
+++ b/client/fileupload_test.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build unit
+
 package client
 
 import (
diff --git a/client/uploads_azure_test.go b/client/uploads_azure_test.go
index abaad00..0479423 100644
--- a/client/uploads_azure_test.go
+++ b/client/uploads_azure_test.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build unit
+
 package client
 
 import (
diff --git a/client/uploads_test.go b/client/uploads_test.go
index 44ec633..2ca3461 100644
--- a/client/uploads_test.go
+++ b/client/uploads_test.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build unit
+
 package client
 
 import (
diff --git a/integration/aws_upload.go b/integration/aws_upload.go
index 6496bf1..1fd29ff 100644
--- a/integration/aws_upload.go
+++ b/integration/aws_upload.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build integration
+
 package integration
 
 import (
diff --git a/integration/azure_upload.go b/integration/azure_upload.go
index 49eaadd..e931811 100644
--- a/integration/azure_upload.go
+++ b/integration/azure_upload.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build integration
+
 package integration
 
 import (
diff --git a/integration/upload_test_util.go b/integration/upload_test_util.go
index 084b655..fdb2859 100644
--- a/integration/upload_test_util.go
+++ b/integration/upload_test_util.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build integration
+
 package integration
 
 import (
diff --git a/uploaders/aws_test.go b/uploaders/aws_test.go
index 13f9af8..277e39a 100644
--- a/uploaders/aws_test.go
+++ b/uploaders/aws_test.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build unit
+
 package uploaders
 
 import (
diff --git a/uploaders/aws_test_util.go b/uploaders/aws_test_util.go
index a8e643b..f1c07d9 100644
--- a/uploaders/aws_test_util.go
+++ b/uploaders/aws_test_util.go
@@ -9,6 +9,7 @@
 // which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+//go:build unit || integration
 
 package uploaders
 
diff --git a/uploaders/azure_sas_test_util.go b/uploaders/azure_sas_test_util.go
index 20f6781..6271317 100644
--- a/uploaders/azure_sas_test_util.go
+++ b/uploaders/azure_sas_test_util.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build unit || integration
+
 package uploaders
 
 import (
diff --git a/uploaders/azure_test.go b/uploaders/azure_test.go
index 708b5de..917d06d 100644
--- a/uploaders/azure_test.go
+++ b/uploaders/azure_test.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build unit
+
 package uploaders
 
 import (
diff --git a/uploaders/common_test.go b/uploaders/common_test.go
index 0d8129b..0f7c88b 100644
--- a/uploaders/common_test.go
+++ b/uploaders/common_test.go
@@ -10,6 +10,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
+//go:build unit
+
 package uploaders
 
 import (