diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml
index fbe36b781a4c..13089a44cede 100644
--- a/.github/workflows/codebuild-ci.yml
+++ b/.github/workflows/codebuild-ci.yml
@@ -120,4 +120,17 @@ jobs:
         env:
           PR: ${{ github.event.number }}
           BRANCH: ${{ github.head_ref || 'master'}}
-          BASE: ${{ github.base_ref }}
\ No newline at end of file
+          BASE: ${{ github.base_ref }}
+  endpoints-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
+          aws-region: us-west-2
+          role-duration-seconds: 7200
+      - name: Run endpoints test
+        uses: aws-actions/aws-codebuild-run-build@v1
+        with:
+          project-name: aws-sdk-java-v2-endpoints-test
\ No newline at end of file
diff --git a/buildspecs/endpoints-test.yml b/buildspecs/endpoints-test.yml
new file mode 100644
index 000000000000..58381bfbe402
--- /dev/null
+++ b/buildspecs/endpoints-test.yml
@@ -0,0 +1,17 @@
+version: 0.2
+
+phases:
+  install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
+  build:
+    commands:
+      - mvn clean install -P endpoint-tests -T1C $MAVEN_OPTIONS
+    finally:
+      - mkdir -p codebuild-test-reports
+      - find ./ -name 'TEST-*.xml' -type f -exec cp {} codebuild-test-reports/ \;
+reports:
+  IntegTests:
+    files:
+      - 'codebuild-test-reports/**/*'
diff --git a/buildspecs/resources/ci.cloudformation.yml b/buildspecs/resources/ci.cloudformation.yml
index bd9e7338b63d..02adcf3a24c4 100644
--- a/buildspecs/resources/ci.cloudformation.yml
+++ b/buildspecs/resources/ci.cloudformation.yml
@@ -56,6 +56,7 @@ Resources:
                   - !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-JDK8-windows
                   - !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-native-image-test
                   - !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-sonar
+                  - !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-endpoints-test
               - Effect: Allow
                 Action:
                   - logs:GetLogEvents
@@ -67,6 +68,7 @@ Resources:
                   - !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-JDK8-windows:*
                   - !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-native-image-test:*
                   - !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-sonar:*
+                  - !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-endpoints-test:*
 
   GithubOidc:
     Type: AWS::IAM::OIDCProvider
diff --git a/pom.xml b/pom.xml
index 5a46a72b1cc7..8c6d1b6214f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,6 +270,8 @@
                             <exclude>**/*IntegrationTests.java</exclude>
                             <exclude>**/*IntegTest.java</exclude>
                             <exclude>**/*IntegrationTestCase.java</exclude>
+                            <exclude>**/*ClientEndpointTests.java</exclude>
+                            <exclude>**/*EndpointProviderTests.java</exclude>
                         </excludes>
                         <includes>
                             <include>**/Test*.java</include>