diff --git a/build/azure-pipelines.artifact.yml b/build/azure-pipelines.artifact.yml
index 1a45896..1c808eb 100644
--- a/build/azure-pipelines.artifact.yml
+++ b/build/azure-pipelines.artifact.yml
@@ -28,7 +28,7 @@ steps:
       BUILD_ID: $(Build.BuildId)
 
   - task: PublishBuildArtifacts@1
-    displayName: "Publish Artifact: LocalStack.Client"
+    displayName: "Publish Artifact: LocalStack.AwsLocal"
     inputs:
       PathtoPublish: artifacts/
-      ArtifactName: LocalStack.Client
\ No newline at end of file
+      ArtifactName: LocalStack.AwsLocal
\ No newline at end of file
diff --git a/build/azure-pipelines.macos.yml b/build/azure-pipelines.macos.yml
index 3d93779..14e5a09 100644
--- a/build/azure-pipelines.macos.yml
+++ b/build/azure-pipelines.macos.yml
@@ -24,10 +24,4 @@ steps:
     inputs:
       testResultsFormat: "VSTest"
       testResultsFiles: "**/*.trx"
-      testRunTitle: "LocalStack.Client.Tests"
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: "VSTest"
-      testResultsFiles: "**/*.trx"
-      testRunTitle: "LocalStack.Client.Integration.Tests"
+      testRunTitle: "LocalStack.AwsLocal.Tests"
diff --git a/build/azure-pipelines.ubuntu.yml b/build/azure-pipelines.ubuntu.yml
index 57e55ec..5987163 100644
--- a/build/azure-pipelines.ubuntu.yml
+++ b/build/azure-pipelines.ubuntu.yml
@@ -27,10 +27,4 @@ steps:
     inputs:
       testResultsFormat: "VSTest"
       testResultsFiles: "**/*.trx"
-      testRunTitle: "LocalStack.Client.Tests"
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: "VSTest"
-      testResultsFiles: "**/*.trx"
-      testRunTitle: "LocalStack.Client.Integration.Tests"
+      testRunTitle: "LocalStack.AwsLocal.Tests"
diff --git a/build/azure-pipelines.windows.yml b/build/azure-pipelines.windows.yml
index 3d0a627..547ee80 100644
--- a/build/azure-pipelines.windows.yml
+++ b/build/azure-pipelines.windows.yml
@@ -24,10 +24,4 @@ steps:
     inputs:
       testResultsFormat: "VSTest"
       testResultsFiles: "**/*.trx"
-      testRunTitle: "LocalStack.Client.Tests"
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: "VSTest"
-      testResultsFiles: "**/*.trx"
-      testRunTitle: "LocalStack.Client.Integration.Tests"
+      testRunTitle: "LocalStack.AwsLocal.Tests"