diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 03d1623c..116878f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  test-no-extras:
+    name: test-no-extras
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
@@ -39,7 +40,42 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install build
 
-          make install-all-extras
+          make install-no-extras-for-test
+
+      - name: Test with pytest
+        run: |
+          python -m pytest tests -p no:warnings
+
+      - name: Test with pytest
+        run: |
+          python -m pytest src/hyperactive -p no:warnings
+
+  test-all-extras:
+    name: test-all-extras
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        os: ["macos-latest", "windows-latest", "ubuntu-latest"]
+
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install build
+
+          make install-all-extras-for-test
 
       - name: Test with pytest
         run: |
diff --git a/Makefile b/Makefile
index 42159410..e94c3e24 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,12 @@ install-build-requirements:
 install-all-extras:
 	python -m pip install .[all_extras]
 
+install-no-extras-for-test:
+	python -m pip install .[test]
+
+install-all-extras-for-test:
+	python -m pip install .[all_extras,test]
+
 install-editable:
 	pip install -e .
 
diff --git a/pyproject.toml b/pyproject.toml
index b165a184..cca40503 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,8 +61,6 @@ test = [
   "pathos",
 ]
 all_extras = [
-  "hyperactive[build]",
-  "hyperactive[test]",
   "hyperactive[integrations]",
 ]