diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index cd31a9a6c..10c8a6a13 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   tests:
-    name: Test
+    name: Test (SwiftPM)
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
       linux_swift_versions: '["nightly-main"]'
@@ -18,6 +18,23 @@ jobs:
       macos_xcode_versions: '["16.3"]'
       macos_versions: '["sequoia"]'
 
+  cmake_build:
+    name: Build (CMake)
+    runs-on: ubuntu-latest
+    container: swiftlang/swift:nightly-main-noble
+    steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v1
+      - name: Install Dependencies
+        shell: bash
+        run: apt update && apt install -y cmake ninja-build
+      - name: Configure Project
+        shell: bash
+        run: cmake -G 'Ninja' -B build -S . -DCMAKE_C_COMPILER=clang -DCMAKE_Swift_COMPILER=swiftc -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=YES
+      - name: Build Project
+        shell: bash
+        run: cmake --build build
+
   soundness:
     name: Soundness
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12eb7612d..ac49f5534 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ else()
     message(STATUS "_SwiftFoundationICU_SourceDIR not provided, checking out local copy of swift-foundation-icu")
     FetchContent_Declare(SwiftFoundationICU
         GIT_REPOSITORY https://github.com/apple/swift-foundation-icu.git
-        GIT_TAG 0.0.9)
+        GIT_TAG main)
 endif()
 
 if (_SwiftCollections_SourceDIR)
diff --git a/Sources/FoundationMacros/CMakeLists.txt b/Sources/FoundationMacros/CMakeLists.txt
index a595a1057..b0cbed634 100644
--- a/Sources/FoundationMacros/CMakeLists.txt
+++ b/Sources/FoundationMacros/CMakeLists.txt
@@ -43,7 +43,7 @@ if(NOT SwiftSyntax_FOUND)
     # If building at desk, check out and link against the SwiftSyntax repo's targets
     FetchContent_Declare(SwiftSyntax
         GIT_REPOSITORY https://github.com/swiftlang/swift-syntax.git
-        GIT_TAG 600.0.0)
+        GIT_TAG main)
     FetchContent_MakeAvailable(SwiftSyntax)
 else()
   message(STATUS "SwiftSyntax_DIR provided, using swift-syntax from ${SwiftSyntax_DIR}")