diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 922ab123..0ed3e5e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,19 +16,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '16', '17', '19', '21' ]
-        runs-on: [ubuntu-latest, macos-12, windows-2019] # Note macos-12, not latest/14, due to hdf5 install issue
-        exclude:
-          - runs-on: macos-latest
-            java: "8"
-          - runs-on: macos-latest
-            java: "16"
+        java: [ '8', '11', '17', '19', '21', '25' ]
+        runs-on: [ubuntu-latest, macos-15-intel, windows-latest] # Note macos-15-intel, not latest/14, due to hdf5 install issue
+
 
     name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up JDK ${{ matrix.Java }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.Java }}
         distribution: 'temurin'
@@ -36,11 +32,12 @@ jobs:
     - name: Install and test (non Win)
       env:
         main_repo_branch: ${GITHUB_REF_NAME}
-      if: ${{ matrix.runs-on != 'windows-2019' }}
+      if: ${{ ! contains(matrix.runs-on, 'windows') }}
       run: |
         export main_repo_branch=${{env.main_repo_branch}}
+        if [[ ${main_repo_branch} == "osb_test_master" ]]; then main_repo_branch=master ; fi
         if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" && ${main_repo_branch} != "experimental" && ${main_repo_branch} != *"osb"* ]]; then main_repo_branch=development ; fi
-        echo Using branch $main_repo_branch
+        echo "Using branch $main_repo_branch, current branch is $GITHUB_REF_NAME"
 
         git clone https://github.com/NeuroML/org.neuroml.model.injectingplugin.git
         cd org.neuroml.model.injectingplugin
@@ -72,7 +69,7 @@ jobs:
         mvn dependency:tree
 
     - name: Install and test (Win)
-      if: ${{ matrix.runs-on == 'windows-2019' }}
+      if: ${{ contains(matrix.runs-on, 'windows') }}
       run: |
         # Install org.neuroml.model.injectingplugin