diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 00000000..fc539545
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,29 @@
+name: Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+        
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+
+    - name: Build with Gradle
+      run: ./gradlew build --no-daemon
+      working-directory: 'pitmutationmate'
+      
+    - name: Run Tests
+      run: ./gradlew test --no-daemon 
+      working-directory: 'pitmutationmate'
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 71eb928d..00000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Build and Test
-
-on:
-  push:
-    branches:
-      - main  
-      
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-
-      - name: Set up JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '17'
-          
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3   
-
-      - name: Build with Gradle
-        run: gradle build --no-daemon 
-        working-directory: 'pitmutationmate'
-        
-      - name: Run Tests
-        run: gradle test --no-daemon 
-        working-directory: 'pitmutationmate'