diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b84b02b29..64d78a588 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,10 +42,14 @@ jobs:
       matrix:
         include:
           - os: macos-13
-            python: 3.7
+            python: "3.7"
+
+          - os: macos-14
+            python: "3.12"
+            zmq: bundled
 
           - os: macos-14
-            python: 3.12
+            python: "3.13-dev"
             zmq: bundled
 
           - os: macos-13
@@ -53,7 +57,7 @@ jobs:
             zmq: bundled
 
           - os: ubuntu-20.04
-            python: 3.7
+            python: "3.7"
             zmq: bundled
             tornado: none
 
@@ -65,7 +69,7 @@ jobs:
             python: pypy-3.7
 
           - os: ubuntu-22.04
-            python: 3.9
+            python: "3.9"
             tornado: head
 
           - os: ubuntu-22.04
@@ -81,6 +85,9 @@ jobs:
           - os: ubuntu-22.04
             python: "3.12"
 
+          - os: ubuntu-22.04
+            python: "3.13-dev"
+
           - os: windows-2022
             python: "3.7"
             arch: x86
@@ -90,7 +97,7 @@ jobs:
             arch: x64
 
           - os: windows-2022
-            python: "3.11"
+            python: "3.13-dev"
             arch: x64
 
     steps:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62ffa841d..1583c39af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,7 +199,7 @@ if (ZMQ_PREFIX STREQUAL "bundled")
     if (MSVC)
       # select vs build solution by msvc version number
       if (NOT PYZMQ_LIBSODIUM_VS_VERSION)
-        if(MSVC_VERSION GREATER 1940)
+        if(MSVC_VERSION GREATER_EQUAL 1940)
           message(STATUS "Unrecognized MSVC_VERSION=${MSVC_VERSION}")
           set(MSVC_VERSION 1939)
         endif()