diff --git a/repos/spack_repo/builtin/build_systems/cmake.py b/repos/spack_repo/builtin/build_systems/cmake.py
index f41091ba5ac..3b879f0a46b 100644
--- a/repos/spack_repo/builtin/build_systems/cmake.py
+++ b/repos/spack_repo/builtin/build_systems/cmake.py
@@ -228,7 +228,9 @@ class CMakePackage(PackageBase):
         # must conflict.
         # this should be updated to reflect a oneapi fortran provider
         # once oneapi is usable with fortran on Windows
-        conflicts("cmake@:4.0", when="%cxx=msvc %fortran=msvc")
+        # NOTE: commented out for now because cmake@3 is used in Spack CI
+        # successfully with %fortran=msvc.
+        # depends_on("cmake@4.1:", type="build", when="%cxx=msvc %fortran=msvc")
 
     def flags_to_build_system_args(self, flags):
         """Return a list of all command line arguments to pass the specified
diff --git a/repos/spack_repo/builtin/packages/curl/package.py b/repos/spack_repo/builtin/packages/curl/package.py
index c20759db0b7..ae6a8b835cb 100644
--- a/repos/spack_repo/builtin/packages/curl/package.py
+++ b/repos/spack_repo/builtin/packages/curl/package.py
@@ -91,7 +91,7 @@ class Curl(NMakePackage, AutotoolsPackage, CMakePackage):
 
     # CMake 4.0: is not compatible with CMake systems requiring
     # 3.0, which curl@7.63 requires
-    depends_on("cmake@:3", when="build_system=cmake @:7.63")
+    depends_on("cmake@:3", type="build", when="build_system=cmake @:7.63")
 
     depends_on("gnutls@3.6.5:", when="tls=gnutls @8.18:")
     depends_on("gnutls", when="tls=gnutls")
diff --git a/repos/spack_repo/builtin/packages/libuv/package.py b/repos/spack_repo/builtin/packages/libuv/package.py
index 63e0f17aa50..68e57db8979 100644
--- a/repos/spack_repo/builtin/packages/libuv/package.py
+++ b/repos/spack_repo/builtin/packages/libuv/package.py
@@ -101,7 +101,7 @@ def url_for_version(self, version):
     with when("build_system=cmake"):
         # explicitly require ownlibs to indicate we're short
         # circuiting the cmake<->libuv cyclic dependency here
-        depends_on("cmake+ownlibs")
+        depends_on("cmake+ownlibs", type="build")
 
     conflicts(
         "%gcc@:4.8",
diff --git a/repos/spack_repo/builtin/packages/scitokens_cpp/package.py b/repos/spack_repo/builtin/packages/scitokens_cpp/package.py
index d347178204b..38c4e80f25c 100644
--- a/repos/spack_repo/builtin/packages/scitokens_cpp/package.py
+++ b/repos/spack_repo/builtin/packages/scitokens_cpp/package.py
@@ -42,8 +42,8 @@ class ScitokensCpp(CMakePackage):
 
     depends_on("cxx", type="build")  # generated
 
-    depends_on("cmake@2.6:")
-    depends_on("cmake@3.10:", when="@0.7.1:")
+    depends_on("cmake@2.6:", type="build")
+    depends_on("cmake@3.10:", type="build", when="@0.7.1:")
     depends_on("openssl")
     depends_on("sqlite")
     depends_on("curl")