diff --git a/Package.swift b/Package.swift
index 4978109043f..286f95767bc 100644
--- a/Package.swift
+++ b/Package.swift
@@ -517,8 +517,7 @@ let package = Package(
             name: "WorkspaceTests",
             dependencies: ["Workspace", "SPMTestSupport"]
         ),
-        // rdar://101868275 "error: cannot find 'XCTAssertEqual' in scope" can affect almost any functional test, so we flat out disable them all until we know what is going on
-        /*.testTarget(
+        .testTarget(
             name: "FunctionalTests",
             dependencies: [
                 "swift-build",
@@ -527,7 +526,7 @@ let package = Package(
                 "PackageModel",
                 "SPMTestSupport"
             ]
-        ),*/
+        ),
         .testTarget(
             name: "FunctionalPerformanceTests",
             dependencies: [
diff --git a/Tests/CommandsTests/BuildToolTests.swift b/Tests/CommandsTests/BuildToolTests.swift
index ed7314143d9..47fde6e0b2a 100644
--- a/Tests/CommandsTests/BuildToolTests.swift
+++ b/Tests/CommandsTests/BuildToolTests.swift
@@ -280,7 +280,7 @@ final class BuildToolTests: CommandsTestCase {
     }
 
     func testBuildCompleteMessage() throws {
-        throw XCTSkip("This test fails to match the 'Compiling' regex; rdar://101815761")
+        throw XCTSkip("This test isn't stable w.r.t. the build cache; rdar://101815761")
 
         try fixture(name: "DependencyResolution/Internal/Simple") { fixturePath in
             do {
diff --git a/Tests/FunctionalTests/PluginTests.swift b/Tests/FunctionalTests/PluginTests.swift
index 79bc3d8eb42..282153968bd 100644
--- a/Tests/FunctionalTests/PluginTests.swift
+++ b/Tests/FunctionalTests/PluginTests.swift
@@ -461,6 +461,7 @@ class PluginTests: XCTestCase {
                         outputDirectory: pluginDir.appending(component: "output"),
                         toolSearchDirectories: toolSearchDirectories,
                         toolNamesToPaths: [:],
+                        toolNamesToTriples: [:],
                         writableDirectories: [pluginDir.appending(component: "output")],
                         readOnlyDirectories: [package.path],
                         fileSystem: localFileSystem,
@@ -722,6 +723,7 @@ class PluginTests: XCTestCase {
                 outputDirectory: pluginDir.appending(component: "output"),
                 toolSearchDirectories: [try UserToolchain.default.swiftCompilerPath.parentDirectory],
                 toolNamesToPaths: [:],
+                toolNamesToTriples: [:],
                 writableDirectories: [pluginDir.appending(component: "output")],
                 readOnlyDirectories: [package.path],
                 fileSystem: localFileSystem,
diff --git a/Tests/WorkspaceTests/InitTests.swift b/Tests/WorkspaceTests/InitTests.swift
index aca6a76aa6a..756ea693c56 100644
--- a/Tests/WorkspaceTests/InitTests.swift
+++ b/Tests/WorkspaceTests/InitTests.swift
@@ -266,8 +266,6 @@ class InitTests: XCTestCase {
     }
     
     func testNonC99NameExecutablePackage() throws {
-        throw XCTSkip("This test fails to find XCTAssertEqual; rdar://101868275")
-
         try withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
             XCTAssertDirectoryExists(tempDirPath)
             
diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
index 015f423e125..fc378bd0de8 100644
--- a/Tests/WorkspaceTests/WorkspaceTests.swift
+++ b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -4291,8 +4291,6 @@ final class WorkspaceTests: XCTestCase {
 
     // This verifies that the simplest possible loading APIs are available for package clients.
     func testSimpleAPI() throws {
-        throw XCTSkip("This test fails to find XCTAssertEqual; rdar://101868275")
-
         try testWithTemporaryDirectory { path in
             // Create a temporary package as a test case.
             let packagePath = path.appending(component: "MyPkg")
diff --git a/Utilities/bootstrap b/Utilities/bootstrap
index 55c8d3710ae..b275568b2fe 100755
--- a/Utilities/bootstrap
+++ b/Utilities/bootstrap
@@ -361,11 +361,7 @@ def test(args):
 
     note("Testing")
     parse_test_args(args)
-    cmd = [
-        "SWIFT_EXEC=" + args.swiftc_path,
-        "SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path,
-        os.path.join(args.bin_dir, "swift-test")
-    ]
+    cmd = [os.path.join(args.bin_dir, "swift-test")]
     if args.parallel:
         cmd.append("--parallel")
     for arg in args.filter: