diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..17e9b6a
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,61 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        directory:
+          - openai-agents-sdk
+          - pydantic-ai
+          - claude-agent-sdk
+    defaults:
+      run:
+        working-directory: ${{ matrix.directory }}
+    steps:
+      - uses: actions/checkout@v7
+      - name: Set up Python
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.15"
+      - name: Install dependencies
+        run: |
+          pip install -U pip
+          pip install -r requirements.txt
+      - name: Lint and check formatting
+        run: |
+          ruff check .
+          ruff format --check .
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        directory:
+          - openai-agents-sdk
+          - pydantic-ai
+          - claude-agent-sdk
+    defaults:
+      run:
+        working-directory: ${{ matrix.directory }}
+    steps:
+      - uses: actions/checkout@v7
+      - name: Set up Python
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.15"
+      - name: Install dependencies
+        run: |
+          pip install -U pip
+          pip install -r requirements.txt
+          pip install ".[test]"
+      - name: Run all tests
+        run: |
+          pytest
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
deleted file mode 100644
index f5e040f..0000000
--- a/.github/workflows/ruff.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Linting and formatting validation using ruff
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    strategy:
-      matrix:
-        directory:
-          - openai-agents-sdk
-          - pydantic-ai
-          - claude-agent-sdk
-    defaults:
-      run:
-        working-directory: ${{ matrix.directory }}
-
-    steps:
-      - uses: actions/checkout@v7
-      - name: Set up Python
-        uses: actions/setup-python@v7
-        with:
-          python-version: "3.13"
-      - name: Install dependencies
-        run: |
-          pip install -U pip
-          pip install -r requirements.txt
-      - name: Lint and check formatting with ruff
-        run: |
-          ruff check .
-          ruff format --check .
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index dee38fc..0000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Run all the unit tests
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    strategy:
-      matrix:
-        directory:
-          - openai-agents-sdk
-          - pydantic-ai
-          - claude-agent-sdk
-    defaults:
-      run:
-        working-directory: ${{ matrix.directory }}
-
-    steps:
-      - uses: actions/checkout@v7
-      - name: Set up Python
-        uses: actions/setup-python@v7
-        with:
-          python-version: "3.13"
-      - name: Install dependencies
-        run: |
-          pip install -U pip
-          pip install -r requirements.txt
-          pip install ".[test]"
-      - name: Run all tests
-        run: |
-          pytest