diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 201f9294a141a..ece3a2d1ec485 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,7 +38,7 @@ jobs:
     name: Clippy on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-15, windows-2022]
+        os: [ubuntu-24.04, macos-15, windows-2025]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     steps:
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         toolchain: [stable, nightly, 1.63.0]
-        os: [ubuntu-24.04, macos-15, windows-2022]
+        os: [ubuntu-24.04, macos-15, windows-2025]
         include:
           - toolchain: beta
             os: ubuntu-24.04
@@ -89,7 +89,7 @@ jobs:
               # Remove `-Dwarnings` at the MSRV since lints may be different
               export RUSTFLAGS=""
               # Remove `ctest-next` which uses the 2024 edition
-              perl -i -ne 'print unless /"ctest-(next|test)",/' Cargo.toml
+              perl -i -ne 'print unless /"ctest-next",/' Cargo.toml
           fi
 
           ./ci/verify-build.sh
@@ -122,19 +122,19 @@ jobs:
           - target: aarch64-apple-darwin
             os: macos-15
           - target: x86_64-pc-windows-gnu
-            os: windows-2022
+            os: windows-2025
             env:
               ARCH_BITS: 64
               ARCH: x86_64
           - target: x86_64-pc-windows-msvc
-            os: windows-2022
+            os: windows-2025
           # FIXME: It currently causes segfaults.
           #- target: i686-pc-windows-gnu
           #  env:
           #    ARCH_BITS: 32
           #    ARCH: i686
           - target: i686-pc-windows-msvc
-            os: windows-2022
+            os: windows-2025
     runs-on: ${{ matrix.os }}
     timeout-minutes: 25
     env:
@@ -320,7 +320,7 @@ jobs:
     - name: Install Rust
       run: rustup update "$MSRV" --no-self-update && rustup default "$MSRV"
     - name: Remove edition 2024 crates
-      run: perl -i -ne 'print unless /"ctest-(next|test)",/' Cargo.toml
+      run: perl -i -ne 'print unless /"ctest-next",/' Cargo.toml
     - uses: Swatinem/rust-cache@v2
     - run: cargo build -p ctest
 
diff --git a/ci/create-artifacts.py b/ci/create-artifacts.py
index 23710c9cf602a..8f277baea6445 100755
--- a/ci/create-artifacts.py
+++ b/ci/create-artifacts.py
@@ -42,23 +42,4 @@ def main():
 
 
 if __name__ == "__main__":
-    # FIXME(ci): remove after the bump to windoes-2025 GHA images
-    # Python <= 3.9 does not support the very helpful `root_dir` argument,
-    # and that is the version used by the Windows GHA images. Rather than
-    # using setup-python or doing something in the CI script, just find
-    # the newer version and relaunch if this happens to be run with an old
-    # version.
-    try:
-        glob("", root_dir="")
-    except TypeError:
-        if os.environ.get("CI") is None:
-            sys.exit(1)
-
-        # Find the next 3.1x Python version
-        dirs = sorted(list(Path(r"C:\hostedtoolcache\windows\Python").iterdir()))
-        usepy = next(x for x in dirs if r"\3.1" in str(x))
-        py = usepy.joinpath(r"x64\python.exe")
-        print(f"relaunching with {py}")
-        os.execvp(py, [__file__] + sys.argv)
-
     main()
diff --git a/src/windows/gnu/mod.rs b/src/windows/gnu/mod.rs
index aee2c1efed108..7ea6a933c8e85 100644
--- a/src/windows/gnu/mod.rs
+++ b/src/windows/gnu/mod.rs
@@ -18,9 +18,6 @@ cfg_if! {
     }
 }
 
-pub const L_tmpnam: c_uint = 14;
-pub const TMP_MAX: c_uint = 0x7fff;
-
 // stdio file descriptor numbers
 pub const STDIN_FILENO: c_int = 0;
 pub const STDOUT_FILENO: c_int = 1;
diff --git a/src/windows/mod.rs b/src/windows/mod.rs
index dfee0df55c8f7..e0be9a5c2e4b1 100644
--- a/src/windows/mod.rs
+++ b/src/windows/mod.rs
@@ -243,6 +243,9 @@ pub const SIG_GET: crate::sighandler_t = 2;
 pub const SIG_SGE: crate::sighandler_t = 3;
 pub const SIG_ACK: crate::sighandler_t = 4;
 
+pub const L_tmpnam: c_uint = 260;
+pub const TMP_MAX: c_uint = 0x7fff_ffff;
+
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum FILE {}
 impl Copy for FILE {}
diff --git a/src/windows/msvc/mod.rs b/src/windows/msvc/mod.rs
index 5b620bc6c1afa..967df8c57f8bd 100644
--- a/src/windows/msvc/mod.rs
+++ b/src/windows/msvc/mod.rs
@@ -1,8 +1,5 @@
 use crate::prelude::*;
 
-pub const L_tmpnam: c_uint = 260;
-pub const TMP_MAX: c_uint = 0x7fff_ffff;
-
 // POSIX Supplement (from errno.h)
 // This particular error code is only currently available in msvc toolchain
 pub const EOTHER: c_int = 131;