diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml
index aeab9758e5..5f94f58fa4 100644
--- a/.github/workflows/IKVM.yml
+++ b/.github/workflows/IKVM.yml
@@ -519,7 +519,7 @@ jobs:
       matrix: ${{ fromJSON(needs.test-vars.outputs.matrix) }}
     name: Test (${{ matrix.run }}:${{ matrix.tfm }}:${{ matrix.sys }})
     timeout-minutes: 240
-    runs-on: ${{ fromJSON('{"win-x86":["windows-2022"],"win-x64":["windows-2022"],"linux-x64":["ubuntu-24.04"],"linux-arm64":["ubuntu-24.04-arm"],"osx-x64":["macos-13"],"osx-arm64":["macos-14"]}')[matrix.sys] }}
+    runs-on: ${{ fromJSON('{"win-x86":["windows-2025"],"win-x64":["windows-2025"],"linux-x64":["ubuntu-24.04"],"linux-arm64":["ubuntu-24.04-arm"],"osx-x64":["macos-13"],"osx-arm64":["macos-14"]}')[matrix.sys] }}
     steps:
     - name: Free Disk Space (Linux)
       if: runner.os == 'Linux'
@@ -532,7 +532,7 @@ jobs:
       if: runner.os == 'Windows'
       shell: pwsh
       run: |
-        $dir="C:\w"
+        $dir="D:\w"
         mkdir $dir
         mkdir $dir\temp
         mkdir $dir\dotnet
diff --git a/Directory.Build.props b/Directory.Build.props
index a5f3841826..f9bad43f61 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -24,7 +24,7 @@
         <OpenJdkMajorVersion>1</OpenJdkMajorVersion>
         <OpenJdkMinorVersion>8</OpenJdkMinorVersion>
         <OpenJdkMicroVersion>0</OpenJdkMicroVersion>
-        <OpenJdkUpdateVersion>472</OpenJdkUpdateVersion>
+        <OpenJdkUpdateVersion>482</OpenJdkUpdateVersion>
         <OpenJdkBuildNumber>b08</OpenJdkBuildNumber>
         <OpenJdkVersion>OpenJDK $(OpenJdkMinorVersion)u$(OpenJdkUpdateVersion) $(OpenJdkBuildNumber)</OpenJdkVersion>
         <OpenJdkFullVersion>$(OpenJdkMajorVersion).$(OpenJdkMinorVersion).$(OpenJdkMicroVersion)_$(OpenJdkUpdateVersion)-$(OpenJdkBuildNumber)</OpenJdkFullVersion>
diff --git a/ext/openjdk b/ext/openjdk
index 336276d5af..69137c6403 160000
--- a/ext/openjdk
+++ b/ext/openjdk
@@ -1 +1 @@
-Subproject commit 336276d5af26a2f41055899fa1e62d527482edad
+Subproject commit 69137c64034c4d1c93e8d5c9fd1b46e3d8016d87
diff --git a/src/IKVM.OpenJDK.Tests/jdk/test/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/test/ExcludeList.txt
index 5c40088ded..baa9796704 100644
--- a/src/IKVM.OpenJDK.Tests/jdk/test/ExcludeList.txt
+++ b/src/IKVM.OpenJDK.Tests/jdk/test/ExcludeList.txt
@@ -2351,6 +2351,7 @@ javax/swing/AbstractButton/6711682/bug6711682.java
 javax/swing/AbstractButton/AnimatedIcon/AnimatedIcon.java                                                               generic-all
 javax/swing/AncestorNotifier/7193219/bug7193219.java                                                                    generic-all
 javax/swing/DataTransfer/6456844/bug6456844.java                                                                        generic-all
+javax/swing/DefaultButtonModel/DefaultButtonModelCrashTest.java                                                         generic-all
 javax/swing/DataTransfer/8059739/bug8059739.java                                                                        generic-all
 javax/swing/GroupLayout/6613904/bug6613904.java                                                                         generic-all
 javax/swing/GroupLayout/7071166/bug7071166.java                                                                         generic-all
@@ -2438,6 +2439,7 @@ javax/swing/JFileChooser/8062561/bug8062561.java
 javax/swing/JFileChooser/8080628/bug8080628.java                                                                        generic-all
 javax/swing/JFileChooser/FileChooserListenerLeak.java                                                                   generic-all
 javax/swing/JFileChooser/FileFilterDescription/FileFilterDescription.java                                               generic-all
+javax/swing/JFileChooser/FileSystemView/Win32FolderSort.java                                                            generic-all
 javax/swing/JFormattedTextField/Test6462562.java                                                                        generic-all
 javax/swing/JFrame/4962534/bug4962534.html                                                                              generic-all
 javax/swing/JFrame/8016356/bug8016356.java                                                                              generic-all
@@ -2800,6 +2802,7 @@ jdk/lambda/vm/InterfaceAccessFlagsTest.java
 jdk/lambda/vm/StrictfpDefault.java                                                                                      generic-all
 jdk/net/Sockets/Test.java                                                                                               generic-all
 jdk/tools/launcher/JliLaunchTest.sh                                                                                     generic-all
+lib/property/CheckWindowsProperty.java                                                                                  generic-all
 lib/security/CheckBlacklistedCerts.java                                                                                 generic-all
 lib/security/java.policy/Ext_AllPolicy.sh                                                                               generic-all
 lib/testlibrary/AssertsTest.java                                                                                        generic-all
@@ -3257,7 +3260,7 @@ java/net/PortUnreachableException/Concurrent.java
 java/net/Socket/InheritHandle.java                                                                                      linux-all,macosx-all
 java/net/Socket/LingerTest.java                                                                                         linux-all
 java/net/Socket/NullHost.java                                                                                           linux-all
-java/net/Socket/asyncClose/AsyncClose.java                                                                              linux-all,macosx-all
+java/net/Socket/asyncClose/AsyncClose.java                                                                              generic-all # this used to work at one point on Windows, but it seems to have regressed, and it's not clear if it's a test issue or an implementation issue
 java/net/Socket/setReuseAddress/Basic.java                                                                              linux-all
 
 java/net/URL/B5086147.sh                                                                                                linux-all
@@ -4280,6 +4283,7 @@ java/awt/Focus/Headless/HeadlessContainerOrderFocusTraversalPolicy.java
 java/awt/Focus/Headless/HeadlessDefaultFocusTraversalPolicy.java                                                        macosx-all
 java/awt/Focus/Headless/HeadlessDefaultKeyboardFocusManager.java                                                        macosx-all
 java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.html                                             macosx-all
+java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java                                             generic-all
 java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html                                           macosx-all
 java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.html                                       linux-all,macosx-all
 java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html                                           macosx-all