diff --git a/CMakeLists.txt b/CMakeLists.txt
index 482df3d..fb6985e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,9 @@ find_package(Clang REQUIRED CONFIG)
 find_package(Swift REQUIRED CONFIG)
 find_package(SwiftSyntax REQUIRED CONFIG)
 
+set(THREADS_PREFER_PTHREAD_FLAG YES)
+include(FindThreads)
+
 message("Using LLVM_CONFIG: ${Swift_CONFIG}")
 message("Using Clang_CONFIG: ${LLVM_CONFIG}")
 message("Using Swift_CONFIG: ${Clang_CONFIG}")
@@ -17,6 +20,7 @@ set (CODEQL_SWIFT_VERSION_MAJOR ${SWIFT_VERSION_MAJOR})
 set (CODEQL_SWIFT_VERSION_MINOR ${SWIFT_VERSION_MINOR})
 set (CODEQL_SWIFT_VERSION_PATCH ${SWIFT_VERSION_PATCH})
 
+# TODO: these are now upstreamed
 configure_file(${CMAKE_SOURCE_DIR}/CodeQLSwiftVersion.h.in
                ${SWIFT_BINARY_DIR}/include/swift/CodeQLSwiftVersion.h)
 
diff --git a/patches/swift/expose-swift-version.patch b/patches/swift/expose-swift-version.patch
deleted file mode 100644
index 928654e..0000000
--- a/patches/swift/expose-swift-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/modules/SwiftConfig.cmake.in b/cmake/modules/SwiftConfig.cmake.in
-index 262ed49d8fc..e13988f1513 100644
---- a/cmake/modules/SwiftConfig.cmake.in
-+++ b/cmake/modules/SwiftConfig.cmake.in
-@@ -2,6 +2,10 @@
- 
- @SWIFT_CONFIG_CODE@
- 
-+set(SWIFT_VERSION_MAJOR @SWIFT_VERSION_MAJOR@)
-+set(SWIFT_VERSION_MINOR @SWIFT_VERSION_MINOR@)
-+set(SWIFT_VERSION_PATCH @SWIFT_VERSION_PATCHLEVEL@)
-+
- set(SWIFT_VERSION @SWIFT_VERSION@)
- set(SWIFT_MAIN_SRC_DIR @SWIFT_SOURCE_DIR@)
- 
diff --git a/pkg_swift_llvm.py b/pkg_swift_llvm.py
index 5d95c7c..0dd63b9 100755
--- a/pkg_swift_llvm.py
+++ b/pkg_swift_llvm.py
@@ -173,9 +173,8 @@ def main(opts):
     os.mkdir(tmp)
     llvm_build_tree = next(opts.build_tree.glob("llvm-*"))
     swift_build_tree = next(opts.build_tree.glob("swift-*"))
-    earlyswiftsyntax_build_tree = next(opts.build_tree.glob("earlyswiftsyntax-*"))
     configured = configure_dummy_project(tmp, prefixes=[llvm_build_tree, swift_build_tree,
-                                                        earlyswiftsyntax_build_tree / "cmake" / "modules"])
+                                                        swift_build_tree / 'cmake' / 'modules'])
     libs = get_libs(configured)
 
     exported = tmp / "exported"
diff --git a/swift-build-presets b/swift-build-presets
index ec0e6a1..fd132c3 100644
--- a/swift-build-presets
+++ b/swift-build-presets
@@ -11,7 +11,6 @@ skip-test-sourcekit-lsp
 skip-test-playgroundsupport
 skip-test-skstresstester
 skip-test-swiftformat
-skip-test-swiftevolve
 skip-test-toolchain-benchmarks
 skip-test-swift-inspect
 skip-test-swift