diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index d0ee0317357..efb96d01253 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -118,7 +118,6 @@ jobs:
           set -o pipefail && \
           NSUnbufferedIO=YES xcodebuild \
             -scheme aws-sdk-swift-protocol-tests-Package \
-            -testPlan ProtocolTestPlan \
             -destination '${{ matrix.destination }}' \
             test 2>&1 \
             | xcbeautify
@@ -183,18 +182,6 @@ jobs:
         run: ./scripts/ci_steps/install_native_linux_dependencies.sh
       - name: Tools Versions
         run: ./scripts/ci_steps/log_tool_versions.sh
-      # Configure fake credentials using profiles
-      - name: (Credentials 1/3) Create AWS config directory
-        run: mkdir -p ~/.aws
-      - name: (Credentials 2/3) Create AWS config file
-        run: |
-          echo "[default]" > ~/.aws/config
-          echo "region=us-west-2" >> ~/.aws/config
-      - name: (Credentials 3/3) Create AWS credentials file
-        run: |
-          echo "[default]" > ~/.aws/credentials
-          echo "aws_access_key_id = test-key-id" >> ~/.aws/credentials
-          echo "aws_secret_access_key = test-secret-access-key" >> ~/.aws/credentials
       - name: Prepare Protocol & Unit Tests
         run: |
           ./scripts/ci_steps/prepare_protocol_and_unit_tests.sh
diff --git a/Sources/Services/AWSS3/Tests/AWSS3Tests/DeleteObjectTaggingRequestTest.swift b/Sources/Services/AWSS3/Tests/AWSS3Tests/DeleteObjectTaggingRequestTest.swift
index c0f8f183e4a..8c645e32d2b 100644
--- a/Sources/Services/AWSS3/Tests/AWSS3Tests/DeleteObjectTaggingRequestTest.swift
+++ b/Sources/Services/AWSS3/Tests/AWSS3Tests/DeleteObjectTaggingRequestTest.swift
@@ -12,6 +12,7 @@ import ClientRuntime
 import Smithy
 import SmithyTestUtil
 import XCTest
+import func SmithyTestUtil.dummyIdentityResolver
 
 
 class DeleteObjectTaggingRequestTest: HttpRequestTestBase {
@@ -28,10 +29,13 @@ class DeleteObjectTaggingRequestTest: HttpRequestTestBase {
             resolvedHost: "mybucket.s3.us-west-2.amazonaws.com"
         )
 
-        let config = try await S3Client.S3ClientConfiguration()
-        config.region = "us-west-2"
-        config.httpClientEngine = ProtocolTestClient()
-        config.idempotencyTokenGenerator = ProtocolTestIdempotencyTokenGenerator()
+        let config = try await S3Client.Config(
+            awsCredentialIdentityResolver: try SmithyTestUtil.dummyIdentityResolver(),
+            region: "us-west-2",
+            signingRegion: "us-west-2",
+            idempotencyTokenGenerator: ProtocolTestIdempotencyTokenGenerator(),
+            httpClientEngine: ProtocolTestClient()
+        )
         let client = S3Client(config: config)
 
         let input = DeleteObjectTaggingInput(
@@ -57,10 +61,13 @@ class DeleteObjectTaggingRequestTest: HttpRequestTestBase {
             resolvedHost: "mybucket.s3.us-west-2.amazonaws.com"
         )
 
-        let config = try await S3Client.S3ClientConfiguration()
-        config.region = "us-west-2"
-        config.httpClientEngine = ProtocolTestClient()
-        config.idempotencyTokenGenerator = ProtocolTestIdempotencyTokenGenerator()
+        let config = try await S3Client.Config(
+            awsCredentialIdentityResolver: try SmithyTestUtil.dummyIdentityResolver(),
+            region: "us-west-2",
+            signingRegion: "us-west-2",
+            idempotencyTokenGenerator: ProtocolTestIdempotencyTokenGenerator(),
+            httpClientEngine: ProtocolTestClient()
+        )
         let client = S3Client(config: config)
 
         let input = DeleteObjectTaggingInput(
diff --git a/Sources/Services/AWSS3/Tests/AWSS3Tests/GetObjectRequestTest.swift b/Sources/Services/AWSS3/Tests/AWSS3Tests/GetObjectRequestTest.swift
index a43940bfa8a..47008932ec8 100644
--- a/Sources/Services/AWSS3/Tests/AWSS3Tests/GetObjectRequestTest.swift
+++ b/Sources/Services/AWSS3/Tests/AWSS3Tests/GetObjectRequestTest.swift
@@ -13,6 +13,7 @@ import Foundation
 import Smithy
 import SmithyTestUtil
 import XCTest
+import func SmithyTestUtil.dummyIdentityResolver
 
 
 class GetObjectRequestTest: HttpRequestTestBase {
@@ -26,10 +27,13 @@ class GetObjectRequestTest: HttpRequestTestBase {
             resolvedHost: "mybucket.s3.us-west-2.amazonaws.com"
         )
 
-        let config = try await S3Client.S3ClientConfiguration()
-        config.region = "us-west-2"
-        config.httpClientEngine = ProtocolTestClient()
-        config.idempotencyTokenGenerator = ProtocolTestIdempotencyTokenGenerator()
+        let config = try await S3Client.Config(
+            awsCredentialIdentityResolver: try SmithyTestUtil.dummyIdentityResolver(),
+            region: "us-west-2",
+            signingRegion: "us-west-2",
+            idempotencyTokenGenerator: ProtocolTestIdempotencyTokenGenerator(),
+            httpClientEngine: ProtocolTestClient()
+        )
         let client = S3Client(config: config)
 
         let input = GetObjectInput(
@@ -52,10 +56,13 @@ class GetObjectRequestTest: HttpRequestTestBase {
             resolvedHost: "mybucket.s3.us-west-2.amazonaws.com"
         )
 
-        let config = try await S3Client.S3ClientConfiguration()
-        config.region = "us-west-2"
-        config.httpClientEngine = ProtocolTestClient()
-        config.idempotencyTokenGenerator = ProtocolTestIdempotencyTokenGenerator()
+        let config = try await S3Client.Config(
+            awsCredentialIdentityResolver: try SmithyTestUtil.dummyIdentityResolver(),
+            region: "us-west-2",
+            signingRegion: "us-west-2",
+            idempotencyTokenGenerator: ProtocolTestIdempotencyTokenGenerator(),
+            httpClientEngine: ProtocolTestClient()
+        )
         let client = S3Client(config: config)
 
         let input = GetObjectInput(
diff --git a/codegen/.swiftpm/xcode/xcshareddata/xcschemes/aws-sdk-swift-protocol-tests-Package.xcscheme b/codegen/.swiftpm/xcode/xcshareddata/xcschemes/aws-sdk-swift-protocol-tests-Package.xcscheme
deleted file mode 100644
index b7f82e739ce..00000000000
--- a/codegen/.swiftpm/xcode/xcshareddata/xcschemes/aws-sdk-swift-protocol-tests-Package.xcscheme
+++ /dev/null
@@ -1,472 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1540"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "APIGatewayTestSDK"
-               BuildableName = "APIGatewayTestSDK"
-               BlueprintName = "APIGatewayTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSJson1_0TestSDK"
-               BuildableName = "AWSJson1_0TestSDK"
-               BlueprintName = "AWSJson1_0TestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSJson1_1TestSDK"
-               BuildableName = "AWSJson1_1TestSDK"
-               BlueprintName = "AWSJson1_1TestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSQueryTestSDK"
-               BuildableName = "AWSQueryTestSDK"
-               BlueprintName = "AWSQueryTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSRestJsonTestSDK"
-               BuildableName = "AWSRestJsonTestSDK"
-               BlueprintName = "AWSRestJsonTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSRestJsonValidationTestSDK"
-               BuildableName = "AWSRestJsonValidationTestSDK"
-               BlueprintName = "AWSRestJsonValidationTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AwsQueryExtras"
-               BuildableName = "AwsQueryExtras"
-               BlueprintName = "AwsQueryExtras"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Ec2QueryTestSDK"
-               BuildableName = "Ec2QueryTestSDK"
-               BlueprintName = "Ec2QueryTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EventStream"
-               BuildableName = "EventStream"
-               BlueprintName = "EventStream"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "GlacierTestSDK"
-               BuildableName = "GlacierTestSDK"
-               BlueprintName = "GlacierTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "MachineLearningTestSDK"
-               BuildableName = "MachineLearningTestSDK"
-               BlueprintName = "MachineLearningTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "RPCEventStream"
-               BuildableName = "RPCEventStream"
-               BlueprintName = "RPCEventStream"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "RestXmlTestSDK"
-               BuildableName = "RestXmlTestSDK"
-               BlueprintName = "RestXmlTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "RestXmlWithNamespaceTestSDK"
-               BuildableName = "RestXmlWithNamespaceTestSDK"
-               BlueprintName = "RestXmlWithNamespaceTestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "S3TestSDK"
-               BuildableName = "S3TestSDK"
-               BlueprintName = "S3TestSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Waiters"
-               BuildableName = "Waiters"
-               BlueprintName = "Waiters"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "rest_json_extras"
-               BuildableName = "rest_json_extras"
-               BlueprintName = "rest_json_extras"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "StringArrayEndpointParam"
-               BuildableName = "StringArrayEndpointParam"
-               BlueprintName = "StringArrayEndpointParam"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:XCTestPlans/ProtocolTestPlan.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "APIGatewayTestSDKTests"
-               BuildableName = "APIGatewayTestSDKTests"
-               BlueprintName = "APIGatewayTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSJson1_0TestSDKTests"
-               BuildableName = "AWSJson1_0TestSDKTests"
-               BlueprintName = "AWSJson1_0TestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSJson1_1TestSDKTests"
-               BuildableName = "AWSJson1_1TestSDKTests"
-               BlueprintName = "AWSJson1_1TestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSQueryTestSDKTests"
-               BuildableName = "AWSQueryTestSDKTests"
-               BlueprintName = "AWSQueryTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSRestJsonTestSDKTests"
-               BuildableName = "AWSRestJsonTestSDKTests"
-               BlueprintName = "AWSRestJsonTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AWSRestJsonValidationTestSDKTests"
-               BuildableName = "AWSRestJsonValidationTestSDKTests"
-               BlueprintName = "AWSRestJsonValidationTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AwsQueryExtrasTests"
-               BuildableName = "AwsQueryExtrasTests"
-               BlueprintName = "AwsQueryExtrasTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Ec2QueryTestSDKTests"
-               BuildableName = "Ec2QueryTestSDKTests"
-               BlueprintName = "Ec2QueryTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "GlacierTestSDKTests"
-               BuildableName = "GlacierTestSDKTests"
-               BlueprintName = "GlacierTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "MachineLearningTestSDKTests"
-               BuildableName = "MachineLearningTestSDKTests"
-               BlueprintName = "MachineLearningTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "RestXmlTestSDKTests"
-               BuildableName = "RestXmlTestSDKTests"
-               BlueprintName = "RestXmlTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "RestXmlWithNamespaceTestSDKTests"
-               BuildableName = "RestXmlWithNamespaceTestSDKTests"
-               BlueprintName = "RestXmlWithNamespaceTestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "S3TestSDKTests"
-               BuildableName = "S3TestSDKTests"
-               BlueprintName = "S3TestSDKTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WaitersTests"
-               BuildableName = "WaitersTests"
-               BlueprintName = "WaitersTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "rest_json_extrasTests"
-               BuildableName = "rest_json_extrasTests"
-               BlueprintName = "rest_json_extrasTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "StringArrayEndpointParamTests"
-               BuildableName = "StringArrayEndpointParamTests"
-               BlueprintName = "StringArrayEndpointParamTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "APIGatewayTestSDK"
-            BuildableName = "APIGatewayTestSDK"
-            BlueprintName = "APIGatewayTestSDK"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/codegen/XCTestPlans/ProtocolTestPlan.xctestplan b/codegen/XCTestPlans/ProtocolTestPlan.xctestplan
deleted file mode 100644
index ecb6ac3d0a0..00000000000
--- a/codegen/XCTestPlans/ProtocolTestPlan.xctestplan
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-  "configurations" : [
-    {
-      "id" : "13F35EEE-6A97-4B33-90EE-D251A1D42E6F",
-      "name" : "Test Scheme Action",
-      "options" : {
-
-      }
-    }
-  ],
-  "defaultOptions" : {
-    "environmentVariableEntries" : [
-      {
-        "key" : "AWS_DEFAULT_REGION",
-        "value" : "us-west-2"
-      },
-      {
-        "key" : "AWS_REGION",
-        "value" : "us-west-2"
-      },
-      {
-        "key" : "AWS_ACCESS_KEY_ID",
-        "value" : "your-access-key-id"
-      },
-      {
-        "key" : "AWS_SECRET_ACCESS_KEY",
-        "value" : "your-secret-access-key"
-      },
-      {
-        "key" : "AWS_SESSION_TOKEN",
-        "value" : "your-session-token"
-      },
-    ]
-  },
-  "testTargets" : [
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "APIGatewayTestSDKTests",
-        "name" : "APIGatewayTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "AWSJson1_0TestSDKTests",
-        "name" : "AWSJson1_0TestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "AWSJson1_1TestSDKTests",
-        "name" : "AWSJson1_1TestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "AWSQueryTestSDKTests",
-        "name" : "AWSQueryTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "AWSRestJsonTestSDKTests",
-        "name" : "AWSRestJsonTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "AWSRestJsonValidationTestSDKTests",
-        "name" : "AWSRestJsonValidationTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "AwsQueryExtrasTests",
-        "name" : "AwsQueryExtrasTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "Ec2QueryTestSDKTests",
-        "name" : "Ec2QueryTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "GlacierTestSDKTests",
-        "name" : "GlacierTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "MachineLearningTestSDKTests",
-        "name" : "MachineLearningTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "RestXmlTestSDKTests",
-        "name" : "RestXmlTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "RestXmlWithNamespaceTestSDKTests",
-        "name" : "RestXmlWithNamespaceTestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "S3TestSDKTests",
-        "name" : "S3TestSDKTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "WaitersTests",
-        "name" : "WaitersTests"
-      }
-    },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "rest_json_extrasTests",
-        "name" : "rest_json_extrasTests"
-      }
-    }
-  ],
-  "version" : 1
-}