diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5d7e40337..4f1eb0a5b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Configure environment variables
         run: |
           echo "SWIFT_SDK_ID=${{ steps.setup-swiftwasm.outputs.swift-sdk-id }}" >> $GITHUB_ENV
-          echo "SWIFT_PATH=$(dirname $(which swiftc))" >> $GITHUB_ENV
+          echo "SWIFT_BIN_PATH=$(dirname $(which swiftc))" >> $GITHUB_ENV
       - run: make bootstrap
       - run: make unittest
         # Skip unit tests with uwasi because its proc_exit throws
diff --git a/Plugins/PackageToJS/README.md b/Plugins/PackageToJS/README.md
index 8b1821187..cbcaf19c5 100644
--- a/Plugins/PackageToJS/README.md
+++ b/Plugins/PackageToJS/README.md
@@ -41,5 +41,5 @@ swift test --package-path ./Plugins/PackageToJS
 Please define the following environment variables when you want to run E2E tests:
 
 - `SWIFT_SDK_ID`: Specifies the Swift SDK identifier to use
-- `SWIFT_PATH`: Specifies the `bin` path to the Swift toolchain to use
+- `SWIFT_BIN_PATH`: Specifies the `bin` path to the Swift toolchain to use
 
diff --git a/Plugins/PackageToJS/Tests/ExampleTests.swift b/Plugins/PackageToJS/Tests/ExampleTests.swift
index 01c02c193..d26832771 100644
--- a/Plugins/PackageToJS/Tests/ExampleTests.swift
+++ b/Plugins/PackageToJS/Tests/ExampleTests.swift
@@ -7,8 +7,8 @@ extension Trait where Self == ConditionTrait {
     static var requireSwiftSDK: ConditionTrait {
         .enabled(
             if: ProcessInfo.processInfo.environment["SWIFT_SDK_ID"] != nil
-                && ProcessInfo.processInfo.environment["SWIFT_PATH"] != nil,
-            "Requires SWIFT_SDK_ID and SWIFT_PATH environment variables"
+                && ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"] != nil,
+            "Requires SWIFT_SDK_ID and SWIFT_BIN_PATH environment variables"
         )
     }
 
@@ -16,7 +16,7 @@ extension Trait where Self == ConditionTrait {
         .enabled(
             if: {
                 guard let swiftSDKID = ProcessInfo.processInfo.environment["SWIFT_SDK_ID"],
-                    ProcessInfo.processInfo.environment["SWIFT_PATH"] != nil
+                    ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"] != nil
                 else {
                     return false
                 }
@@ -32,22 +32,22 @@ extension Trait where Self == ConditionTrait {
                 }
                 return sanityCheckCompatibility(triple: triple)
             }(),
-            "Requires SWIFT_SDK_ID and SWIFT_PATH environment variables"
+            "Requires SWIFT_SDK_ID and SWIFT_BIN_PATH environment variables"
         )
     }
 
     static func requireEmbeddedSwiftInToolchain(triple: String) -> ConditionTrait {
-        // Check if $SWIFT_PATH/../lib/swift/embedded/wasm32-unknown-none-wasm/ exists
+        // Check if $SWIFT_BIN_PATH/../lib/swift/embedded/wasm32-unknown-none-wasm/ exists
         return .enabled(
             if: {
-                guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_PATH"] else {
+                guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"] else {
                     return false
                 }
                 let embeddedPath = URL(fileURLWithPath: swiftPath).deletingLastPathComponent()
                     .appending(path: "lib/swift/embedded/\(triple)")
                 return FileManager.default.fileExists(atPath: embeddedPath.path)
             }(),
-            "Requires embedded Swift SDK under $SWIFT_PATH/../lib/swift/embedded"
+            "Requires embedded Swift SDK under $SWIFT_BIN_PATH/../lib/swift/embedded"
         )
     }
 
@@ -75,7 +75,7 @@ extension Trait where Self == ConditionTrait {
                         return false
                     }
                 }
-                guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_PATH"],
+                guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"],
                     let swiftSDKID = ProcessInfo.processInfo.environment["SWIFT_SDK_ID"]
                 else {
                     return false
@@ -102,7 +102,7 @@ extension Trait where Self == ConditionTrait {
     }
 
     static func getSwiftPath() -> String? {
-        ProcessInfo.processInfo.environment["SWIFT_PATH"]
+        ProcessInfo.processInfo.environment["SWIFT_BIN_PATH"]
     }
 
     static func getEmbeddedSwiftSDKID() -> String? {