diff --git a/schemes/main/build/build-target-toolchain.sh b/schemes/main/build/build-target-toolchain.sh
index 30f2286..8e53202 100755
--- a/schemes/main/build/build-target-toolchain.sh
+++ b/schemes/main/build/build-target-toolchain.sh
@@ -40,7 +40,7 @@ build_target_toolchain() {
   env DESTDIR="$TRIPLE_DESTDIR" \
     cmake --install "$TARGET_BUILD_ROOT/$STDLIB_PRODUCT-$HOST_SUFFIX" --prefix /usr
 
-  local swift_testing_build_dir="$TARGET_BUILD_ROOT/swift-testing-$SHORT_TRIPLE"
+  local swift_testing_build_dir="$TARGET_BUILD_ROOT/wasmswiftsdk-$HOST_SUFFIX/swift-testing/$TRIPLE"
   # TODO: Remove this check once we build swift-testing for +threads target
   if [[ -d "$swift_testing_build_dir" ]]; then
     env DESTDIR="$TRIPLE_DESTDIR" \
diff --git a/schemes/main/build/run-test.sh b/schemes/main/build/run-test.sh
index a7f5667..aa92d6f 100755
--- a/schemes/main/build/run-test.sh
+++ b/schemes/main/build/run-test.sh
@@ -3,7 +3,8 @@
 set -euxo pipefail
 
 SOURCE_PATH="$(cd "$(dirname "$0")/../../../.." && pwd)"
-TARGET_BUILD_ROOT="$SOURCE_PATH/build/WebAssembly"
+BUILD_DIR="$SOURCE_PATH/build"
+TARGET_BUILD_ROOT="$BUILD_DIR/WebAssembly"
 
 HOST_SUFFIX=$(find "$TARGET_BUILD_ROOT" -name "wasmstdlib-*" -exec basename {} \; | sed 's/wasmstdlib-//')
-env "PATH=$TARGET_BUILD_ROOT/llvm-$HOST_SUFFIX/bin:$PATH" "LIT_FILTER_OUT=(IRGen/|embedded/)" ninja check-swift-wasi-wasm32-custom -C "$TARGET_BUILD_ROOT/wasmstdlib-$HOST_SUFFIX"
+env "PATH=$TARGET_BUILD_ROOT/llvm-$HOST_SUFFIX/bin:$BUILD_DIR/llvm-tools/bin:$PATH" "LIT_FILTER_OUT=(IRGen/|embedded/)" ninja check-swift-wasi-wasm32-custom -C "$TARGET_BUILD_ROOT/wasmstdlib-$HOST_SUFFIX"
diff --git a/schemes/main/manifest.json b/schemes/main/manifest.json
index 0f33f3e..1a5d167 100644
--- a/schemes/main/manifest.json
+++ b/schemes/main/manifest.json
@@ -1,5 +1,5 @@
 {
-  "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-06-12-a",
+  "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-06-17-a",
   "icu4c": [],
   "libxml2": [
     "https://github.com/swiftwasm/libxml2-wasm/releases/download/2.0.0/libxml2-wasm32-unknown-wasi.tar.gz",