diff --git a/.github/workflows/test.yml b/.github/workflows/linux.yml
similarity index 81%
rename from .github/workflows/test.yml
rename to .github/workflows/linux.yml
index 0d9c254..a3e3734 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/linux.yml
@@ -14,8 +14,6 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macOS-latest
-#          - windows-latest
         raku-version:
           - 'latest'
           - '2021.12'
@@ -28,9 +26,6 @@ jobs:
       - name: Install Libraries (Ubuntu)
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get install -y libfreetype6-dev
-      - name: Install Libraries (MacOS)
-        if: matrix.os == 'macOS-latest'
-        run: brew reinstall freetype
       - name: Install Dependencies
         run: |
           zef install --/test App::Prove6
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 0000000..5b5d765
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,35 @@
+name: test
+
+on:
+  push:
+    branches:
+      - '*'
+    tags-ignore:
+      - '*'
+  pull_request:
+
+jobs:
+  raku:
+    strategy:
+      matrix:
+        os:
+          - macOS-latest
+        raku-version:
+          - 'latest'
+          - '2021.12'
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Raku/setup-raku@v1
+        with:
+          raku-version: ${{ matrix.raku-version }}
+      - name: Install Libraries (MacOS)
+        if: matrix.os == 'macOS-latest'
+        run: brew reinstall freetype
+      - name: Install Dependencies
+        run: |
+          zef install --/test App::Prove6
+          zef install --deps-only .
+          zef build .
+      - name: Run Tests
+        run: prove6 -I. t
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000..d02d086
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,32 @@
+name: test
+
+on:
+  push:
+    branches:
+      - '*'
+    tags-ignore:
+      - '*'
+  pull_request:
+
+jobs:
+  raku:
+    strategy:
+      matrix:
+        os:
+          - windows-latest
+        raku-version:
+          - 'latest'
+          - '2021.12'
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Raku/setup-raku@v1
+        with:
+          raku-version: ${{ matrix.raku-version }}
+      - name: Install Dependencies
+        run: |
+          zef install --/test App::Prove6
+          zef install --deps-only .
+          zef build .
+      - name: Run Tests
+        run: prove6 -I. t