diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml
index 09076caf..84e484ae 100644
--- a/.github/workflows/codebuild-ci.yml
+++ b/.github/workflows/codebuild-ci.yml
@@ -55,7 +55,7 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
-          role-duration-seconds: 3600
+          role-duration-seconds: 14400
       - name: Run Unit Tests in Python ${{ matrix.python-version }}
         uses: aws-actions/aws-codebuild-run-build@v1
         with:
@@ -74,7 +74,7 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
-          role-duration-seconds: 3600
+          role-duration-seconds: 14400
       - name: Run Integration Tests in Python ${{ matrix.python-version }}
         uses: aws-actions/aws-codebuild-run-build@v1
         with:
diff --git a/test/integration_tests/cli/test_cli_custom_fsx_inference.py b/test/integration_tests/inference/cli/test_cli_custom_fsx_inference.py
similarity index 100%
rename from test/integration_tests/cli/test_cli_custom_fsx_inference.py
rename to test/integration_tests/inference/cli/test_cli_custom_fsx_inference.py
diff --git a/test/integration_tests/cli/test_cli_custom_s3_inference.py b/test/integration_tests/inference/cli/test_cli_custom_s3_inference.py
similarity index 100%
rename from test/integration_tests/cli/test_cli_custom_s3_inference.py
rename to test/integration_tests/inference/cli/test_cli_custom_s3_inference.py
diff --git a/test/integration_tests/sdk/test_sdk_custom_fsx_inference.py b/test/integration_tests/inference/sdk/test_sdk_custom_fsx_inference.py
similarity index 100%
rename from test/integration_tests/sdk/test_sdk_custom_fsx_inference.py
rename to test/integration_tests/inference/sdk/test_sdk_custom_fsx_inference.py
diff --git a/test/integration_tests/sdk/test_sdk_custom_s3_inference.py b/test/integration_tests/inference/sdk/test_sdk_custom_s3_inference.py
similarity index 100%
rename from test/integration_tests/sdk/test_sdk_custom_s3_inference.py
rename to test/integration_tests/inference/sdk/test_sdk_custom_s3_inference.py