diff --git a/.github/workflows/pypy-tests.yml b/.github/workflows/pypy-tests.yml
deleted file mode 100644
index e6c112cc..00000000
--- a/.github/workflows/pypy-tests.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: PyPy Tests
-
-on:
-  push:
-    branches:
-      - dev-3.x
-    paths:
-      - ".github/workflows/pypy-tests.yml"
-      - "aiogram/**"
-      - "tests/**"
-      - "codecov.yaml"
-      - "pyproject.toml"
-  pull_request:
-    branches:
-      - dev-3.x
-    paths:
-      - ".github/workflows/pypy-tests.yml"
-      - "aiogram/**"
-      - "tests/**"
-      - "pyproject.toml"
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          # - windows-latest
-        python-version:
-          - 'pypy3.8'
-          - 'pypy3.9'
-
-    defaults:
-      # Windows sucks. Force use bash instead of PowerShell
-      run:
-        shell: bash
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "pip"
-          cache-dependency-path: pyproject.toml
-
-      - name: Install project dependencies
-        run: |
-          pip install -e .[dev,test,redis,proxy,i18n,fast]
-
-      - name: Setup redis
-        uses: shogo82148/actions-setup-redis@v1
-        with:
-          redis-version: 6
-
-      - name: Run tests
-        run: |
-          flags=""
-          pytest $flags
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a5228c6f..030da513 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ on:
       - "pyproject.toml"
 
 jobs:
-  build:
+  tests:
     strategy:
       fail-fast: false
       matrix:
@@ -88,3 +88,47 @@ jobs:
           flags: unittests
           name: py-${{ matrix.python-version }}-${{ matrix.os }}
           fail_ci_if_error: true
+
+  pypy-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          # - windows-latest
+        python-version:
+          - 'pypy3.8'
+          - 'pypy3.9'
+
+    defaults:
+      # Windows sucks. Force use bash instead of PowerShell
+      run:
+        shell: bash
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
+
+      - name: Install project dependencies
+        run: |
+          pip install -e .[dev,test,redis,proxy,i18n,fast]
+
+      - name: Setup redis
+        uses: shogo82148/actions-setup-redis@v1
+        with:
+          redis-version: 6
+
+      - name: Run tests
+        run: |
+          flags=""
+          pytest $flags