diff --git a/Package.swift b/Package.swift
index f98b5ac8d9f..545c1bb7b1f 100644
--- a/Package.swift
+++ b/Package.swift
@@ -592,8 +592,8 @@ let package = Package(
         // MARK: Additional Test Dependencies
 
         .target(
-            /** SwiftPM test support library */
-            name: "SPMTestSupport",
+            /** SwiftPM internal test suite support library */
+            name: "_InternalTestSupport",
             dependencies: [
                 "Basics",
                 "Build",
@@ -621,13 +621,13 @@ let package = Package(
             name: "SourceKitLSPAPITests",
             dependencies: [
                 "SourceKitLSPAPI",
-                "SPMTestSupport",
+                "_InternalTestSupport",
             ]
         ),
 
         .testTarget(
             name: "BasicsTests",
-            dependencies: ["Basics", "SPMTestSupport", "tsan_utils"],
+            dependencies: ["Basics", "_InternalTestSupport", "tsan_utils"],
             exclude: [
                 "Archiver/Inputs/archive.tar.gz",
                 "Archiver/Inputs/archive.zip",
@@ -637,15 +637,15 @@ let package = Package(
         ),
         .testTarget(
             name: "BuildTests",
-            dependencies: ["Build", "PackageModel", "SPMTestSupport"]
+            dependencies: ["Build", "PackageModel", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "LLBuildManifestTests",
-            dependencies: ["Basics", "LLBuildManifest", "SPMTestSupport"]
+            dependencies: ["Basics", "LLBuildManifest", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "WorkspaceTests",
-            dependencies: ["Workspace", "SPMTestSupport"]
+            dependencies: ["Workspace", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "PackageDescriptionTests",
@@ -653,32 +653,32 @@ let package = Package(
         ),
         .testTarget(
             name: "SPMBuildCoreTests",
-            dependencies: ["SPMBuildCore", "SPMTestSupport"]
+            dependencies: ["SPMBuildCore", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "PackageLoadingTests",
-            dependencies: ["PackageLoading", "SPMTestSupport"],
+            dependencies: ["PackageLoading", "_InternalTestSupport"],
             exclude: ["Inputs", "pkgconfigInputs"]
         ),
         .testTarget(
             name: "PackageModelTests",
-            dependencies: ["PackageModel", "SPMTestSupport"]
+            dependencies: ["PackageModel", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "PackageModelSyntaxTests",
             dependencies: [
                 "PackageModelSyntax",
-                "SPMTestSupport",
+                "_InternalTestSupport",
                 .product(name: "SwiftIDEUtils", package: "swift-syntax"),
             ]
         ),
         .testTarget(
             name: "PackageGraphTests",
-            dependencies: ["PackageGraph", "SPMTestSupport"]
+            dependencies: ["PackageGraph", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "PackageGraphPerformanceTests",
-            dependencies: ["PackageGraph", "SPMTestSupport"],
+            dependencies: ["PackageGraph", "_InternalTestSupport"],
             exclude: [
                 "Inputs/PerfectHTTPServer.json",
                 "Inputs/ZewoHTTPServer.json",
@@ -688,44 +688,44 @@ let package = Package(
         ),
         .testTarget(
             name: "PackageCollectionsModelTests",
-            dependencies: ["PackageCollectionsModel", "SPMTestSupport"]
+            dependencies: ["PackageCollectionsModel", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "PackageCollectionsSigningTests",
-            dependencies: ["PackageCollectionsSigning", "SPMTestSupport"]
+            dependencies: ["PackageCollectionsSigning", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "PackageCollectionsTests",
-            dependencies: ["PackageCollections", "SPMTestSupport", "tsan_utils"]
+            dependencies: ["PackageCollections", "_InternalTestSupport", "tsan_utils"]
         ),
         .testTarget(
             name: "PackageFingerprintTests",
-            dependencies: ["PackageFingerprint", "SPMTestSupport"]
+            dependencies: ["PackageFingerprint", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "PackagePluginAPITests",
-            dependencies: ["PackagePlugin", "SPMTestSupport"]
+            dependencies: ["PackagePlugin", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "PackageRegistryTests",
-            dependencies: ["SPMTestSupport", "PackageRegistry"]
+            dependencies: ["_InternalTestSupport", "PackageRegistry"]
         ),
         .testTarget(
             name: "PackageSigningTests",
-            dependencies: ["SPMTestSupport", "PackageSigning"]
+            dependencies: ["_InternalTestSupport", "PackageSigning"]
         ),
         .testTarget(
             name: "QueryEngineTests",
-            dependencies: ["QueryEngine", "SPMTestSupport"]
+            dependencies: ["QueryEngine", "_InternalTestSupport"]
         ),
         .testTarget(
             name: "SourceControlTests",
-            dependencies: ["SourceControl", "SPMTestSupport"],
+            dependencies: ["SourceControl", "_InternalTestSupport"],
             exclude: ["Inputs/TestRepo.tgz"]
         ),
         .testTarget(
             name: "XCBuildSupportTests",
-            dependencies: ["XCBuildSupport", "SPMTestSupport"],
+            dependencies: ["XCBuildSupport", "_InternalTestSupport"],
             exclude: ["Inputs/Foo.pc"]
         ),
         // Examples (These are built to ensure they stay up to date with the API.)
@@ -746,7 +746,7 @@ package.targets.append(contentsOf: [
         name: "FunctionalPerformanceTests",
         dependencies: [
             "swift-package-manager",
-            "SPMTestSupport",
+            "_InternalTestSupport",
         ]
     ),
 ])
@@ -760,7 +760,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
             dependencies: [
                 "swift-package-manager",
                 "PackageModel",
-                "SPMTestSupport",
+                "_InternalTestSupport",
             ]
         ),
 
@@ -782,7 +782,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
                 "PackageModelSyntax",
                 "PackageRegistryCommand",
                 "SourceControl",
-                "SPMTestSupport",
+                "_InternalTestSupport",
                 "Workspace",
                 "dummy-swiftc",
             ]
diff --git a/Sources/SPMTestSupport/GitRepositoryExtensions.swift b/Sources/_InternalTestSupport/GitRepositoryExtensions.swift
similarity index 100%
rename from Sources/SPMTestSupport/GitRepositoryExtensions.swift
rename to Sources/_InternalTestSupport/GitRepositoryExtensions.swift
diff --git a/Sources/SPMTestSupport/InMemoryGitRepository.swift b/Sources/_InternalTestSupport/InMemoryGitRepository.swift
similarity index 100%
rename from Sources/SPMTestSupport/InMemoryGitRepository.swift
rename to Sources/_InternalTestSupport/InMemoryGitRepository.swift
diff --git a/Sources/SPMTestSupport/ManifestExtensions.swift b/Sources/_InternalTestSupport/ManifestExtensions.swift
similarity index 100%
rename from Sources/SPMTestSupport/ManifestExtensions.swift
rename to Sources/_InternalTestSupport/ManifestExtensions.swift
diff --git a/Sources/SPMTestSupport/MockArchiver.swift b/Sources/_InternalTestSupport/MockArchiver.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockArchiver.swift
rename to Sources/_InternalTestSupport/MockArchiver.swift
diff --git a/Sources/SPMTestSupport/MockBuildTestHelper.swift b/Sources/_InternalTestSupport/MockBuildTestHelper.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockBuildTestHelper.swift
rename to Sources/_InternalTestSupport/MockBuildTestHelper.swift
diff --git a/Sources/SPMTestSupport/MockDependency.swift b/Sources/_InternalTestSupport/MockDependency.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockDependency.swift
rename to Sources/_InternalTestSupport/MockDependency.swift
diff --git a/Sources/SPMTestSupport/MockDependencyGraph.swift b/Sources/_InternalTestSupport/MockDependencyGraph.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockDependencyGraph.swift
rename to Sources/_InternalTestSupport/MockDependencyGraph.swift
diff --git a/Sources/SPMTestSupport/MockHTTPClient.swift b/Sources/_InternalTestSupport/MockHTTPClient.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockHTTPClient.swift
rename to Sources/_InternalTestSupport/MockHTTPClient.swift
diff --git a/Sources/SPMTestSupport/MockHashAlgorithm.swift b/Sources/_InternalTestSupport/MockHashAlgorithm.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockHashAlgorithm.swift
rename to Sources/_InternalTestSupport/MockHashAlgorithm.swift
diff --git a/Sources/SPMTestSupport/MockManifestLoader.swift b/Sources/_InternalTestSupport/MockManifestLoader.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockManifestLoader.swift
rename to Sources/_InternalTestSupport/MockManifestLoader.swift
diff --git a/Sources/SPMTestSupport/MockPackage.swift b/Sources/_InternalTestSupport/MockPackage.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockPackage.swift
rename to Sources/_InternalTestSupport/MockPackage.swift
diff --git a/Sources/SPMTestSupport/MockPackageContainer.swift b/Sources/_InternalTestSupport/MockPackageContainer.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockPackageContainer.swift
rename to Sources/_InternalTestSupport/MockPackageContainer.swift
diff --git a/Sources/SPMTestSupport/MockPackageFingerprintStorage.swift b/Sources/_InternalTestSupport/MockPackageFingerprintStorage.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockPackageFingerprintStorage.swift
rename to Sources/_InternalTestSupport/MockPackageFingerprintStorage.swift
diff --git a/Sources/SPMTestSupport/MockPackageGraphs.swift b/Sources/_InternalTestSupport/MockPackageGraphs.swift
similarity index 96%
rename from Sources/SPMTestSupport/MockPackageGraphs.swift
rename to Sources/_InternalTestSupport/MockPackageGraphs.swift
index eaa0587cabb..86dba2bbfd3 100644
--- a/Sources/SPMTestSupport/MockPackageGraphs.swift
+++ b/Sources/_InternalTestSupport/MockPackageGraphs.swift
@@ -26,15 +26,13 @@ import struct PackageModel.TargetDescription
 import protocol TSCBasic.FileSystem
 import class TSCBasic.InMemoryFileSystem
 
-@_spi(SwiftPMInternal)
-public typealias MockPackageGraph = (
+package typealias MockPackageGraph = (
     graph: ModulesGraph,
     fileSystem: any FileSystem,
     observabilityScope: ObservabilityScope
 )
 
-@_spi(SwiftPMInternal)
-public func macrosPackageGraph() throws -> MockPackageGraph {
+package func macrosPackageGraph() throws -> MockPackageGraph {
     let fs = InMemoryFileSystem(emptyFiles:
         "/swift-firmware/Sources/Core/source.swift",
         "/swift-firmware/Sources/HAL/source.swift",
@@ -132,8 +130,7 @@ public func macrosPackageGraph() throws -> MockPackageGraph {
     return (graph, fs, observability.topScope)
 }
 
-@_spi(SwiftPMInternal)
-public func macrosTestsPackageGraph() throws -> MockPackageGraph {
+package func macrosTestsPackageGraph() throws -> MockPackageGraph {
     let fs = InMemoryFileSystem(emptyFiles:
         "/swift-mmio/Plugins/MMIOPlugin/source.swift",
         "/swift-mmio/Sources/MMIO/source.swift",
@@ -282,8 +279,7 @@ public func macrosTestsPackageGraph() throws -> MockPackageGraph {
     return (graph, fs, observability.topScope)
 }
 
-@_spi(SwiftPMInternal)
-public func trivialPackageGraph() throws -> MockPackageGraph {
+package func trivialPackageGraph() throws -> MockPackageGraph {
     let fs = InMemoryFileSystem(
         emptyFiles:
         "/Pkg/Sources/app/main.swift",
@@ -313,8 +309,7 @@ public func trivialPackageGraph() throws -> MockPackageGraph {
     return (graph, fs, observability.topScope)
 }
 
-@_spi(SwiftPMInternal)
-public func embeddedCxxInteropPackageGraph() throws -> MockPackageGraph {
+package func embeddedCxxInteropPackageGraph() throws -> MockPackageGraph {
     let fs = InMemoryFileSystem(
         emptyFiles:
         "/Pkg/Sources/app/main.swift",
@@ -356,8 +351,7 @@ public func embeddedCxxInteropPackageGraph() throws -> MockPackageGraph {
     return (graph, fs, observability.topScope)
 }
 
-@_spi(SwiftPMInternal)
-public func toolsExplicitLibrariesGraph(linkage: ProductType.LibraryType) throws -> MockPackageGraph {
+package func toolsExplicitLibrariesGraph(linkage: ProductType.LibraryType) throws -> MockPackageGraph {
     let fs = InMemoryFileSystem(emptyFiles:
         "/swift-mmio/Sources/MMIOMacros/source.swift",
         "/swift-mmio/Sources/MMIOMacrosTests/source.swift",
diff --git a/Sources/SPMTestSupport/MockPackageSigningEntityStorage.swift b/Sources/_InternalTestSupport/MockPackageSigningEntityStorage.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockPackageSigningEntityStorage.swift
rename to Sources/_InternalTestSupport/MockPackageSigningEntityStorage.swift
diff --git a/Sources/SPMTestSupport/MockProduct.swift b/Sources/_InternalTestSupport/MockProduct.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockProduct.swift
rename to Sources/_InternalTestSupport/MockProduct.swift
diff --git a/Sources/SPMTestSupport/MockRegistry.swift b/Sources/_InternalTestSupport/MockRegistry.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockRegistry.swift
rename to Sources/_InternalTestSupport/MockRegistry.swift
diff --git a/Sources/SPMTestSupport/MockTarget.swift b/Sources/_InternalTestSupport/MockTarget.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockTarget.swift
rename to Sources/_InternalTestSupport/MockTarget.swift
diff --git a/Sources/SPMTestSupport/MockWorkspace.swift b/Sources/_InternalTestSupport/MockWorkspace.swift
similarity index 100%
rename from Sources/SPMTestSupport/MockWorkspace.swift
rename to Sources/_InternalTestSupport/MockWorkspace.swift
diff --git a/Sources/SPMTestSupport/Observability.swift b/Sources/_InternalTestSupport/Observability.swift
similarity index 100%
rename from Sources/SPMTestSupport/Observability.swift
rename to Sources/_InternalTestSupport/Observability.swift
diff --git a/Sources/SPMTestSupport/PIFTester.swift b/Sources/_InternalTestSupport/PIFTester.swift
similarity index 100%
rename from Sources/SPMTestSupport/PIFTester.swift
rename to Sources/_InternalTestSupport/PIFTester.swift
diff --git a/Sources/SPMTestSupport/PackageDependencyDescriptionExtensions.swift b/Sources/_InternalTestSupport/PackageDependencyDescriptionExtensions.swift
similarity index 100%
rename from Sources/SPMTestSupport/PackageDependencyDescriptionExtensions.swift
rename to Sources/_InternalTestSupport/PackageDependencyDescriptionExtensions.swift
diff --git a/Sources/SPMTestSupport/PackageGraphTester.swift b/Sources/_InternalTestSupport/PackageGraphTester.swift
similarity index 100%
rename from Sources/SPMTestSupport/PackageGraphTester.swift
rename to Sources/_InternalTestSupport/PackageGraphTester.swift
diff --git a/Sources/SPMTestSupport/ResolvedModule+Mock.swift b/Sources/_InternalTestSupport/ResolvedModule+Mock.swift
similarity index 100%
rename from Sources/SPMTestSupport/ResolvedModule+Mock.swift
rename to Sources/_InternalTestSupport/ResolvedModule+Mock.swift
diff --git a/Sources/SPMTestSupport/SwiftPMProduct.swift b/Sources/_InternalTestSupport/SwiftPMProduct.swift
similarity index 100%
rename from Sources/SPMTestSupport/SwiftPMProduct.swift
rename to Sources/_InternalTestSupport/SwiftPMProduct.swift
diff --git a/Sources/SPMTestSupport/Toolchain.swift b/Sources/_InternalTestSupport/Toolchain.swift
similarity index 100%
rename from Sources/SPMTestSupport/Toolchain.swift
rename to Sources/_InternalTestSupport/Toolchain.swift
diff --git a/Sources/SPMTestSupport/XCTAssertHelpers.swift b/Sources/_InternalTestSupport/XCTAssertHelpers.swift
similarity index 100%
rename from Sources/SPMTestSupport/XCTAssertHelpers.swift
rename to Sources/_InternalTestSupport/XCTAssertHelpers.swift
diff --git a/Sources/SPMTestSupport/XCTSkipHelpers.swift b/Sources/_InternalTestSupport/XCTSkipHelpers.swift
similarity index 100%
rename from Sources/SPMTestSupport/XCTSkipHelpers.swift
rename to Sources/_InternalTestSupport/XCTSkipHelpers.swift
diff --git a/Sources/SPMTestSupport/misc.swift b/Sources/_InternalTestSupport/misc.swift
similarity index 100%
rename from Sources/SPMTestSupport/misc.swift
rename to Sources/_InternalTestSupport/misc.swift
diff --git a/Tests/BasicsTests/Archiver/TarArchiverTests.swift b/Tests/BasicsTests/Archiver/TarArchiverTests.swift
index d4c3ca748ca..ac293583a52 100644
--- a/Tests/BasicsTests/Archiver/TarArchiverTests.swift
+++ b/Tests/BasicsTests/Archiver/TarArchiverTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift b/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift
index 363b20f3537..dd5511133c3 100644
--- a/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift
+++ b/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/BasicsTests/Archiver/ZipArchiverTests.swift b/Tests/BasicsTests/Archiver/ZipArchiverTests.swift
index d0441be4b56..936a0935971 100644
--- a/Tests/BasicsTests/Archiver/ZipArchiverTests.swift
+++ b/Tests/BasicsTests/Archiver/ZipArchiverTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported
 
diff --git a/Tests/BasicsTests/AuthorizationProviderTests.swift b/Tests/BasicsTests/AuthorizationProviderTests.swift
index 8caafbb125b..5e72f4eac99 100644
--- a/Tests/BasicsTests/AuthorizationProviderTests.swift
+++ b/Tests/BasicsTests/AuthorizationProviderTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class AuthorizationProviderTests: XCTestCase {
diff --git a/Tests/BasicsTests/CancellatorTests.swift b/Tests/BasicsTests/CancellatorTests.swift
index 223ab79b654..a9ecef35c8f 100644
--- a/Tests/BasicsTests/CancellatorTests.swift
+++ b/Tests/BasicsTests/CancellatorTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class Basics.AsyncProcess
diff --git a/Tests/BasicsTests/HTTPClientTests.swift b/Tests/BasicsTests/HTTPClientTests.swift
index bf2da10c76a..b113c3c679f 100644
--- a/Tests/BasicsTests/HTTPClientTests.swift
+++ b/Tests/BasicsTests/HTTPClientTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class HTTPClientTests: XCTestCase {
diff --git a/Tests/BasicsTests/LegacyHTTPClientTests.swift b/Tests/BasicsTests/LegacyHTTPClientTests.swift
index 67c78f381da..86d344aede5 100644
--- a/Tests/BasicsTests/LegacyHTTPClientTests.swift
+++ b/Tests/BasicsTests/LegacyHTTPClientTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class LegacyHTTPClientTests: XCTestCase {
diff --git a/Tests/BasicsTests/ObservabilitySystemTests.swift b/Tests/BasicsTests/ObservabilitySystemTests.swift
index 564fe13630a..300c988f8bb 100644
--- a/Tests/BasicsTests/ObservabilitySystemTests.swift
+++ b/Tests/BasicsTests/ObservabilitySystemTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 // TODO: remove when transition to new diagnostics system is complete
diff --git a/Tests/BasicsTests/SQLiteBackedCacheTests.swift b/Tests/BasicsTests/SQLiteBackedCacheTests.swift
index 8678adf61a9..28b1bf34153 100644
--- a/Tests/BasicsTests/SQLiteBackedCacheTests.swift
+++ b/Tests/BasicsTests/SQLiteBackedCacheTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import tsan_utils
 import XCTest
 
diff --git a/Tests/BasicsTests/SandboxTests.swift b/Tests/BasicsTests/SandboxTests.swift
index 110aba487d6..8e59db28a85 100644
--- a/Tests/BasicsTests/SandboxTests.swift
+++ b/Tests/BasicsTests/SandboxTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 #if canImport(Darwin)
diff --git a/Tests/BasicsTests/URLSessionHTTPClientTests.swift b/Tests/BasicsTests/URLSessionHTTPClientTests.swift
index 86418d79b1a..799f0ed637a 100644
--- a/Tests/BasicsTests/URLSessionHTTPClientTests.swift
+++ b/Tests/BasicsTests/URLSessionHTTPClientTests.swift
@@ -17,7 +17,7 @@ import Foundation
 // need to decide how to best deal with that
 import FoundationNetworking
 #endif
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCBasic.ByteString
diff --git a/Tests/BuildTests/BuildOperationTests.swift b/Tests/BuildTests/BuildOperationTests.swift
index f068807bda1..58e42e1aa04 100644
--- a/Tests/BuildTests/BuildOperationTests.swift
+++ b/Tests/BuildTests/BuildOperationTests.swift
@@ -19,7 +19,7 @@ import LLBuildManifest
 import PackageGraph
 import SPMBuildCore
 @_spi(SwiftPMInternal)
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.BufferedOutputByteStream
diff --git a/Tests/BuildTests/BuildPlanTests.swift b/Tests/BuildTests/BuildPlanTests.swift
index 3c721e74d54..bd27cfa7e2f 100644
--- a/Tests/BuildTests/BuildPlanTests.swift
+++ b/Tests/BuildTests/BuildPlanTests.swift
@@ -26,7 +26,7 @@ import PackageLoading
 @testable import PackageModel
 
 import SPMBuildCore
-import SPMTestSupport
+import _InternalTestSupport
 import SwiftDriver
 import Workspace
 import XCTest
diff --git a/Tests/BuildTests/BuildSystemDelegateTests.swift b/Tests/BuildTests/BuildSystemDelegateTests.swift
index e452886efba..2d3d7596955 100644
--- a/Tests/BuildTests/BuildSystemDelegateTests.swift
+++ b/Tests/BuildTests/BuildSystemDelegateTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import var TSCBasic.localFileSystem
diff --git a/Tests/BuildTests/ClangTargetBuildDescriptionTests.swift b/Tests/BuildTests/ClangTargetBuildDescriptionTests.swift
index 4dba8662068..317bd624c95 100644
--- a/Tests/BuildTests/ClangTargetBuildDescriptionTests.swift
+++ b/Tests/BuildTests/ClangTargetBuildDescriptionTests.swift
@@ -15,7 +15,7 @@ import Basics
 import PackageGraph
 import PackageModel
 import SPMBuildCore
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class ClangTargetBuildDescriptionTests: XCTestCase {
diff --git a/Tests/BuildTests/CrossCompilationBuildPlanTests.swift b/Tests/BuildTests/CrossCompilationBuildPlanTests.swift
index 42a5c546479..5a6b42b66e0 100644
--- a/Tests/BuildTests/CrossCompilationBuildPlanTests.swift
+++ b/Tests/BuildTests/CrossCompilationBuildPlanTests.swift
@@ -22,24 +22,19 @@ import class PackageModel.Manifest
 import struct PackageModel.TargetDescription
 import enum PackageModel.ProductType
 import struct SPMBuildCore.BuildParameters
-import func SPMTestSupport.loadPackageGraph
-
-@_spi(SwiftPMInternal)
-import func SPMTestSupport.embeddedCxxInteropPackageGraph
-
-@_spi(SwiftPMInternal)
-import func SPMTestSupport.macrosPackageGraph
-import func SPMTestSupport.macrosTestsPackageGraph
-import func SPMTestSupport.mockBuildParameters
-import func SPMTestSupport.mockBuildPlan
-import func SPMTestSupport.toolsExplicitLibrariesGraph
-
-@_spi(SwiftPMInternal)
-import func SPMTestSupport.trivialPackageGraph
-
-import struct SPMTestSupport.BuildPlanResult
-import func SPMTestSupport.XCTAssertMatch
-import func SPMTestSupport.XCTAssertNoDiagnostics
+import func _InternalTestSupport.loadPackageGraph
+
+import func _InternalTestSupport.embeddedCxxInteropPackageGraph
+import func _InternalTestSupport.macrosPackageGraph
+import func _InternalTestSupport.macrosTestsPackageGraph
+import func _InternalTestSupport.mockBuildParameters
+import func _InternalTestSupport.mockBuildPlan
+import func _InternalTestSupport.toolsExplicitLibrariesGraph
+import func _InternalTestSupport.trivialPackageGraph
+
+import struct _InternalTestSupport.BuildPlanResult
+import func _InternalTestSupport.XCTAssertMatch
+import func _InternalTestSupport.XCTAssertNoDiagnostics
 import class TSCBasic.InMemoryFileSystem
 
 import XCTest
diff --git a/Tests/BuildTests/IncrementalBuildTests.swift b/Tests/BuildTests/IncrementalBuildTests.swift
index 758f6872aa5..31f80abad08 100644
--- a/Tests/BuildTests/IncrementalBuildTests.swift
+++ b/Tests/BuildTests/IncrementalBuildTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 import class Basics.AsyncProcess
 import typealias TSCBasic.ProcessEnvironmentBlock
diff --git a/Tests/BuildTests/LLBuildManifestBuilderTests.swift b/Tests/BuildTests/LLBuildManifestBuilderTests.swift
index 059778901cf..70cafaf35fb 100644
--- a/Tests/BuildTests/LLBuildManifestBuilderTests.swift
+++ b/Tests/BuildTests/LLBuildManifestBuilderTests.swift
@@ -21,7 +21,7 @@ import PackageModel
 import struct SPMBuildCore.BuildParameters
 
 @_spi(SwiftPMInternal)
-import SPMTestSupport
+import _InternalTestSupport
 
 import class TSCBasic.InMemoryFileSystem
 import XCTest
diff --git a/Tests/BuildTests/ModuleAliasingBuildTests.swift b/Tests/BuildTests/ModuleAliasingBuildTests.swift
index f206c3cf0dd..d29a118e41b 100644
--- a/Tests/BuildTests/ModuleAliasingBuildTests.swift
+++ b/Tests/BuildTests/ModuleAliasingBuildTests.swift
@@ -19,7 +19,7 @@ import Basics
 import PackageLoading
 @testable import PackageModel
 import SPMBuildCore
-import SPMTestSupport
+import _InternalTestSupport
 import SwiftDriver
 import Workspace
 import XCTest
diff --git a/Tests/BuildTests/PluginsBuildPlanTests.swift b/Tests/BuildTests/PluginsBuildPlanTests.swift
index f2f2a8e8faf..c0020ed0261 100644
--- a/Tests/BuildTests/PluginsBuildPlanTests.swift
+++ b/Tests/BuildTests/PluginsBuildPlanTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import SPMTestSupport
+import _InternalTestSupport
 @testable import SPMBuildCore
 import XCTest
 import PackageModel
diff --git a/Tests/BuildTests/PrepareForIndexTests.swift b/Tests/BuildTests/PrepareForIndexTests.swift
index c5c01e0950a..a3ab8413909 100644
--- a/Tests/BuildTests/PrepareForIndexTests.swift
+++ b/Tests/BuildTests/PrepareForIndexTests.swift
@@ -13,10 +13,9 @@
 import Build
 import Foundation
 import LLBuildManifest
+import _InternalTestSupport
 import TSCBasic
 import XCTest
-@_spi(SwiftPMInternal)
-import SPMTestSupport
 import class Basics.ObservabilitySystem
 @_spi(DontAdoptOutsideOfSwiftPMExposedForBenchmarksAndTestsOnly)
 import func PackageGraph.loadModulesGraph
diff --git a/Tests/BuildTests/ProductBuildDescriptionTests.swift b/Tests/BuildTests/ProductBuildDescriptionTests.swift
index dd2f6b8a0f4..47e12c627c5 100644
--- a/Tests/BuildTests/ProductBuildDescriptionTests.swift
+++ b/Tests/BuildTests/ProductBuildDescriptionTests.swift
@@ -25,8 +25,8 @@ import struct PackageGraph.ResolvedProduct
 @_spi(DontAdoptOutsideOfSwiftPMExposedForBenchmarksAndTestsOnly)
 import func PackageGraph.loadModulesGraph
 
-import func SPMTestSupport.mockBuildParameters
-import func SPMTestSupport.XCTAssertNoDiagnostics
+import func _InternalTestSupport.mockBuildParameters
+import func _InternalTestSupport.XCTAssertNoDiagnostics
 import XCTest
 
 final class ProductBuildDescriptionTests: XCTestCase {
diff --git a/Tests/CommandsTests/APIDiffTests.swift b/Tests/CommandsTests/APIDiffTests.swift
index 1927805d8bd..ab14973bcbc 100644
--- a/Tests/CommandsTests/APIDiffTests.swift
+++ b/Tests/CommandsTests/APIDiffTests.swift
@@ -20,7 +20,7 @@ import DriverSupport
 import Foundation
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/CommandsTests/BuildCommandTests.swift b/Tests/CommandsTests/BuildCommandTests.swift
index 84365b9724e..bdb8fa91daf 100644
--- a/Tests/CommandsTests/BuildCommandTests.swift
+++ b/Tests/CommandsTests/BuildCommandTests.swift
@@ -17,7 +17,7 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import SPMBuildCore
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/CommandsTests/MermaidPackageSerializerTests.swift b/Tests/CommandsTests/MermaidPackageSerializerTests.swift
index d14e7f30d9e..442adf9704a 100644
--- a/Tests/CommandsTests/MermaidPackageSerializerTests.swift
+++ b/Tests/CommandsTests/MermaidPackageSerializerTests.swift
@@ -19,7 +19,7 @@ import class PackageModel.Manifest
 import struct PackageModel.ProductDescription
 import struct PackageModel.TargetDescription
 import class TSCBasic.InMemoryFileSystem
-import func SPMTestSupport.XCTAssertNoDiagnostics
+import func _InternalTestSupport.XCTAssertNoDiagnostics
 
 @testable
 import Commands
diff --git a/Tests/CommandsTests/MultiRootSupportTests.swift b/Tests/CommandsTests/MultiRootSupportTests.swift
index 024bac2015c..6a5c1778905 100644
--- a/Tests/CommandsTests/MultiRootSupportTests.swift
+++ b/Tests/CommandsTests/MultiRootSupportTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import Commands
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/CommandsTests/PackageCommandTests.swift b/Tests/CommandsTests/PackageCommandTests.swift
index 5d0451b899d..9053ad23aae 100644
--- a/Tests/CommandsTests/PackageCommandTests.swift
+++ b/Tests/CommandsTests/PackageCommandTests.swift
@@ -21,7 +21,7 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/CommandsTests/PackageRegistryCommandTests.swift b/Tests/CommandsTests/PackageRegistryCommandTests.swift
index 5080a3b4c74..28dcb7c0de4 100644
--- a/Tests/CommandsTests/PackageRegistryCommandTests.swift
+++ b/Tests/CommandsTests/PackageRegistryCommandTests.swift
@@ -18,7 +18,7 @@ import PackageModel
 import PackageRegistry
 @testable import PackageRegistryCommand
 import PackageSigning
-import SPMTestSupport
+import _InternalTestSupport
 import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported
 import Workspace
 import XCTest
diff --git a/Tests/CommandsTests/RunCommandTests.swift b/Tests/CommandsTests/RunCommandTests.swift
index d65cd94a746..1be7c3803b6 100644
--- a/Tests/CommandsTests/RunCommandTests.swift
+++ b/Tests/CommandsTests/RunCommandTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import Commands
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class Basics.AsyncProcess
diff --git a/Tests/CommandsTests/SwiftCommandStateTests.swift b/Tests/CommandsTests/SwiftCommandStateTests.swift
index 320db8c5313..29cb5d48e41 100644
--- a/Tests/CommandsTests/SwiftCommandStateTests.swift
+++ b/Tests/CommandsTests/SwiftCommandStateTests.swift
@@ -19,7 +19,7 @@
 import func PackageGraph.loadModulesGraph
 
 @testable import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.BufferedOutputByteStream
diff --git a/Tests/CommandsTests/SwiftSDKCommandTests.swift b/Tests/CommandsTests/SwiftSDKCommandTests.swift
index 1f1a9b57e64..4510ca85e26 100644
--- a/Tests/CommandsTests/SwiftSDKCommandTests.swift
+++ b/Tests/CommandsTests/SwiftSDKCommandTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import Commands
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class Basics.AsyncProcess
diff --git a/Tests/CommandsTests/TestCommandTests.swift b/Tests/CommandsTests/TestCommandTests.swift
index 6608929114c..7b693cabc8b 100644
--- a/Tests/CommandsTests/TestCommandTests.swift
+++ b/Tests/CommandsTests/TestCommandTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import Commands
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class TestCommandTests: CommandsTestCase {
diff --git a/Tests/FunctionalTests/CFamilyTargetTests.swift b/Tests/FunctionalTests/CFamilyTargetTests.swift
index 723ef56907a..7f7b5c92245 100644
--- a/Tests/FunctionalTests/CFamilyTargetTests.swift
+++ b/Tests/FunctionalTests/CFamilyTargetTests.swift
@@ -16,7 +16,7 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/FunctionalTests/DependencyResolutionTests.swift b/Tests/FunctionalTests/DependencyResolutionTests.swift
index d3c93ce5a12..b9343eb866b 100644
--- a/Tests/FunctionalTests/DependencyResolutionTests.swift
+++ b/Tests/FunctionalTests/DependencyResolutionTests.swift
@@ -14,7 +14,7 @@ import Basics
 import Commands
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/FunctionalTests/MacroTests.swift b/Tests/FunctionalTests/MacroTests.swift
index bf058b5a25f..ad394a48ad8 100644
--- a/Tests/FunctionalTests/MacroTests.swift
+++ b/Tests/FunctionalTests/MacroTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import DriverSupport
-import SPMTestSupport
+import _InternalTestSupport
 import PackageModel
 import XCTest
 
diff --git a/Tests/FunctionalTests/MiscellaneousTests.swift b/Tests/FunctionalTests/MiscellaneousTests.swift
index 96e6382a03f..d5a16549a80 100644
--- a/Tests/FunctionalTests/MiscellaneousTests.swift
+++ b/Tests/FunctionalTests/MiscellaneousTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/FunctionalTests/ModuleAliasingFixtureTests.swift b/Tests/FunctionalTests/ModuleAliasingFixtureTests.swift
index 89ca11c42c6..37605843756 100644
--- a/Tests/FunctionalTests/ModuleAliasingFixtureTests.swift
+++ b/Tests/FunctionalTests/ModuleAliasingFixtureTests.swift
@@ -13,7 +13,7 @@
 import Commands
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
  
diff --git a/Tests/FunctionalTests/ModuleMapTests.swift b/Tests/FunctionalTests/ModuleMapTests.swift
index 2a992119655..ec78dac0380 100644
--- a/Tests/FunctionalTests/ModuleMapTests.swift
+++ b/Tests/FunctionalTests/ModuleMapTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import Commands
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
@@ -24,7 +24,7 @@ final class ModuleMapsTestCase: XCTestCase {
         rootpkg: String,
         body: @escaping (AbsolutePath, [String]) async throws -> Void
     ) async throws {
-        try await SPMTestSupport.fixture(name: name) { fixturePath in
+        try await _InternalTestSupport.fixture(name: name) { fixturePath in
             let input = fixturePath.appending(components: cModuleName, "C", "foo.c")
             let triple = try UserToolchain.default.targetTriple
             let outdir = fixturePath.appending(components: rootpkg, ".build", triple.platformBuildPathComponent, "debug")
diff --git a/Tests/FunctionalTests/PluginTests.swift b/Tests/FunctionalTests/PluginTests.swift
index d552f748af9..7fa033572e9 100644
--- a/Tests/FunctionalTests/PluginTests.swift
+++ b/Tests/FunctionalTests/PluginTests.swift
@@ -17,7 +17,7 @@ import Basics
 import PackageLoading
 import PackageModel
 @testable import SPMBuildCore
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/FunctionalTests/ResourcesTests.swift b/Tests/FunctionalTests/ResourcesTests.swift
index 875133b4849..0310b57f782 100644
--- a/Tests/FunctionalTests/ResourcesTests.swift
+++ b/Tests/FunctionalTests/ResourcesTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class ResourcesTests: XCTestCase {
diff --git a/Tests/FunctionalTests/TestDiscoveryTests.swift b/Tests/FunctionalTests/TestDiscoveryTests.swift
index 2332a742ec4..ce0987ea147 100644
--- a/Tests/FunctionalTests/TestDiscoveryTests.swift
+++ b/Tests/FunctionalTests/TestDiscoveryTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class TestDiscoveryTests: XCTestCase {
diff --git a/Tests/FunctionalTests/ToolsVersionTests.swift b/Tests/FunctionalTests/ToolsVersionTests.swift
index b3c98db43ac..d9deb43ca01 100644
--- a/Tests/FunctionalTests/ToolsVersionTests.swift
+++ b/Tests/FunctionalTests/ToolsVersionTests.swift
@@ -14,7 +14,7 @@ import Basics
 import Commands
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/FunctionalTests/TraitTests.swift b/Tests/FunctionalTests/TraitTests.swift
index aea0d4781f9..b31767f795c 100644
--- a/Tests/FunctionalTests/TraitTests.swift
+++ b/Tests/FunctionalTests/TraitTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 #if compiler(>=6.0)
 import DriverSupport
-import SPMTestSupport
+import _InternalTestSupport
 import PackageModel
 import TSCBasic
 import XCTest
diff --git a/Tests/FunctionalTests/VersionSpecificTests.swift b/Tests/FunctionalTests/VersionSpecificTests.swift
index 88ff4577bab..ba50d0a9871 100644
--- a/Tests/FunctionalTests/VersionSpecificTests.swift
+++ b/Tests/FunctionalTests/VersionSpecificTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class VersionSpecificTests: XCTestCase {
diff --git a/Tests/LLBuildManifestTests/LLBuildManifestTests.swift b/Tests/LLBuildManifestTests/LLBuildManifestTests.swift
index ffe03d6e8db..e546e7b065a 100644
--- a/Tests/LLBuildManifestTests/LLBuildManifestTests.swift
+++ b/Tests/LLBuildManifestTests/LLBuildManifestTests.swift
@@ -13,7 +13,7 @@
 import struct Basics.AbsolutePath
 import class Foundation.PropertyListDecoder
 @testable import LLBuildManifest
-import SPMTestSupport
+import _InternalTestSupport
 import class TSCBasic.InMemoryFileSystem
 import XCTest
 
diff --git a/Tests/PackageCollectionsModelTests/PackageCollectionModelTests.swift b/Tests/PackageCollectionsModelTests/PackageCollectionModelTests.swift
index 1fd5973b732..0eba1793424 100644
--- a/Tests/PackageCollectionsModelTests/PackageCollectionModelTests.swift
+++ b/Tests/PackageCollectionsModelTests/PackageCollectionModelTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 @testable import PackageCollectionsModel
diff --git a/Tests/PackageCollectionsSigningTests/CertificatePolicyTests.swift b/Tests/PackageCollectionsSigningTests/CertificatePolicyTests.swift
index 26817d54ed9..eab67559aa9 100644
--- a/Tests/PackageCollectionsSigningTests/CertificatePolicyTests.swift
+++ b/Tests/PackageCollectionsSigningTests/CertificatePolicyTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 @testable import PackageCollectionsSigning
-import SPMTestSupport
+import _InternalTestSupport
 import SwiftASN1
 import X509
 import XCTest
diff --git a/Tests/PackageCollectionsSigningTests/PackageCollectionSigningTests.swift b/Tests/PackageCollectionsSigningTests/PackageCollectionSigningTests.swift
index e9468023c93..72eab5495c3 100644
--- a/Tests/PackageCollectionsSigningTests/PackageCollectionSigningTests.swift
+++ b/Tests/PackageCollectionsSigningTests/PackageCollectionSigningTests.swift
@@ -14,7 +14,7 @@ import Basics
 import Foundation
 import PackageCollectionsModel
 @testable import PackageCollectionsSigning
-import SPMTestSupport
+import _InternalTestSupport
 import X509
 import XCTest
 
diff --git a/Tests/PackageCollectionsSigningTests/SignatureTests.swift b/Tests/PackageCollectionsSigningTests/SignatureTests.swift
index 0cae718c802..0244e76a4e3 100644
--- a/Tests/PackageCollectionsSigningTests/SignatureTests.swift
+++ b/Tests/PackageCollectionsSigningTests/SignatureTests.swift
@@ -15,7 +15,7 @@ import Basics
 import Crypto
 import Foundation
 @testable import PackageCollectionsSigning
-import SPMTestSupport
+import _InternalTestSupport
 import X509
 import XCTest
 
diff --git a/Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift b/Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift
index 5c747f10ef7..2c9b4456f4e 100644
--- a/Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift
+++ b/Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift
@@ -17,7 +17,7 @@ import Basics
 @testable import PackageCollections
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 
 import struct TSCUtility.Version
 
diff --git a/Tests/PackageCollectionsTests/JSONPackageCollectionProviderTests.swift b/Tests/PackageCollectionsTests/JSONPackageCollectionProviderTests.swift
index 994aab6729e..e0fb970a31e 100644
--- a/Tests/PackageCollectionsTests/JSONPackageCollectionProviderTests.swift
+++ b/Tests/PackageCollectionsTests/JSONPackageCollectionProviderTests.swift
@@ -18,7 +18,7 @@ import Basics
 import PackageCollectionsSigning
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 
 class JSONPackageCollectionProviderTests: XCTestCase {
     func testGood() async throws {
diff --git a/Tests/PackageCollectionsTests/PackageCollectionSourceCertificatePolicyTests.swift b/Tests/PackageCollectionsTests/PackageCollectionSourceCertificatePolicyTests.swift
index cadcc91617e..548cc11a6cd 100644
--- a/Tests/PackageCollectionsTests/PackageCollectionSourceCertificatePolicyTests.swift
+++ b/Tests/PackageCollectionsTests/PackageCollectionSourceCertificatePolicyTests.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 @testable import PackageCollections
diff --git a/Tests/PackageCollectionsTests/PackageCollectionsModelTests.swift b/Tests/PackageCollectionsTests/PackageCollectionsModelTests.swift
index 94e929034f2..82d4177230e 100644
--- a/Tests/PackageCollectionsTests/PackageCollectionsModelTests.swift
+++ b/Tests/PackageCollectionsTests/PackageCollectionsModelTests.swift
@@ -13,7 +13,7 @@
 import Basics
 @testable import PackageCollections
 @testable import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class PackageCollectionsModelTests: XCTestCase {
diff --git a/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift b/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift
index 43f32c69f14..7b44c4cdfc7 100644
--- a/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift
+++ b/Tests/PackageCollectionsTests/PackageCollectionsSourcesStorageTest.swift
@@ -12,7 +12,7 @@
 
 import Basics
 @testable import PackageCollections
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift b/Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift
index 462e198658c..d904411e1e6 100644
--- a/Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift
+++ b/Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 @testable import PackageCollections
-import SPMTestSupport
+import _InternalTestSupport
 import tsan_utils
 import XCTest
 
diff --git a/Tests/PackageCollectionsTests/PackageCollectionsTests.swift b/Tests/PackageCollectionsTests/PackageCollectionsTests.swift
index e1d3ce14fed..7915818fa66 100644
--- a/Tests/PackageCollectionsTests/PackageCollectionsTests.swift
+++ b/Tests/PackageCollectionsTests/PackageCollectionsTests.swift
@@ -12,7 +12,7 @@
 
 import Foundation
 import XCTest
-import SPMTestSupport
+import _InternalTestSupport
 
 import Basics
 @testable import PackageCollections
diff --git a/Tests/PackageCollectionsTests/PackageIndexAndCollectionsTests.swift b/Tests/PackageCollectionsTests/PackageIndexAndCollectionsTests.swift
index 0631fdc4360..9294c430b9e 100644
--- a/Tests/PackageCollectionsTests/PackageIndexAndCollectionsTests.swift
+++ b/Tests/PackageCollectionsTests/PackageIndexAndCollectionsTests.swift
@@ -14,7 +14,7 @@ import Basics
 import Foundation
 @testable import PackageCollections
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCUtility.Version
diff --git a/Tests/PackageCollectionsTests/PackageIndexTests.swift b/Tests/PackageCollectionsTests/PackageIndexTests.swift
index 9fb820e17af..fd7c4c0a3cc 100644
--- a/Tests/PackageCollectionsTests/PackageIndexTests.swift
+++ b/Tests/PackageCollectionsTests/PackageIndexTests.swift
@@ -14,7 +14,7 @@ import Basics
 import Foundation
 @testable import PackageCollections
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 class PackageIndexTests: XCTestCase {
diff --git a/Tests/PackageFingerprintTests/FilePackageFingerprintStorageTests.swift b/Tests/PackageFingerprintTests/FilePackageFingerprintStorageTests.swift
index 0f8cfd70c98..1555353490a 100644
--- a/Tests/PackageFingerprintTests/FilePackageFingerprintStorageTests.swift
+++ b/Tests/PackageFingerprintTests/FilePackageFingerprintStorageTests.swift
@@ -14,7 +14,7 @@ import Basics
 import struct Foundation.URL
 @testable import PackageFingerprint
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift b/Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift
index ca2438ccb00..849b6790f71 100644
--- a/Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift
+++ b/Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift
@@ -15,7 +15,7 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import enum TSCBasic.JSON
diff --git a/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift b/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift
index e62cab0ac38..885d6223f79 100644
--- a/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift
+++ b/Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift
@@ -18,7 +18,7 @@ import PackageGraph
 
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageGraphTests/CrossCompilationPackageGraphTests.swift b/Tests/PackageGraphTests/CrossCompilationPackageGraphTests.swift
index f93eb7f4c67..c749ea28aba 100644
--- a/Tests/PackageGraphTests/CrossCompilationPackageGraphTests.swift
+++ b/Tests/PackageGraphTests/CrossCompilationPackageGraphTests.swift
@@ -12,7 +12,7 @@
 
 @testable
 @_spi(SwiftPMInternal)
-import SPMTestSupport
+import _InternalTestSupport
 
 @testable
 import PackageGraph
diff --git a/Tests/PackageGraphTests/DependencyResolverTests.swift b/Tests/PackageGraphTests/DependencyResolverTests.swift
index 43d5fb28c42..6f467772cec 100644
--- a/Tests/PackageGraphTests/DependencyResolverTests.swift
+++ b/Tests/PackageGraphTests/DependencyResolverTests.swift
@@ -17,7 +17,7 @@ import SourceControl
 
 import struct TSCUtility.Version
 
-import SPMTestSupport
+import _InternalTestSupport
 
 import PackageModel
 
diff --git a/Tests/PackageGraphTests/ModulesGraphTests.swift b/Tests/PackageGraphTests/ModulesGraphTests.swift
index ae8f514240b..3aad4251177 100644
--- a/Tests/PackageGraphTests/ModulesGraphTests.swift
+++ b/Tests/PackageGraphTests/ModulesGraphTests.swift
@@ -16,7 +16,7 @@ import Basics
 @testable import PackageGraph
 
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCBasic.ByteString
diff --git a/Tests/PackageGraphTests/PubgrubTests.swift b/Tests/PackageGraphTests/PubgrubTests.swift
index 5152cda19d1..e3a5a8b436c 100644
--- a/Tests/PackageGraphTests/PubgrubTests.swift
+++ b/Tests/PackageGraphTests/PubgrubTests.swift
@@ -16,7 +16,7 @@ import OrderedCollections
 import PackageLoading
 @testable import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageGraphTests/ResolvedTargetTests.swift b/Tests/PackageGraphTests/ResolvedTargetTests.swift
index fdef7eebe5f..b33aeb9cb43 100644
--- a/Tests/PackageGraphTests/ResolvedTargetTests.swift
+++ b/Tests/PackageGraphTests/ResolvedTargetTests.swift
@@ -14,7 +14,7 @@ import XCTest
 
 import PackageGraph
 @testable import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 
 private func XCTAssertEqualTargetIDs(
     _ lhs: [ResolvedModule],
diff --git a/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift b/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift
index f06f5457078..942fae3bd80 100644
--- a/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift
+++ b/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift
@@ -13,7 +13,7 @@
 @testable import Basics
 @testable import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageLoadingTests/ManifestSignatureParserTests.swift b/Tests/PackageLoadingTests/ManifestSignatureParserTests.swift
index f93a059235d..325dc11a34e 100644
--- a/Tests/PackageLoadingTests/ManifestSignatureParserTests.swift
+++ b/Tests/PackageLoadingTests/ManifestSignatureParserTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import Foundation
 import PackageLoading
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 class ManifestSignatureParserTests: XCTestCase {
diff --git a/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift b/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift
index 843ccaee0bc..f951e425c7e 100644
--- a/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift
+++ b/Tests/PackageLoadingTests/ModuleMapGenerationTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageLoadingTests/PDLoadingTests.swift b/Tests/PackageLoadingTests/PDLoadingTests.swift
index aa2bfd7af44..b3970079313 100644
--- a/Tests/PackageLoadingTests/PDLoadingTests.swift
+++ b/Tests/PackageLoadingTests/PDLoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageLoadingTests/PD_4_0_LoadingTests.swift b/Tests/PackageLoadingTests/PD_4_0_LoadingTests.swift
index 365985a8618..3fbc4136141 100644
--- a/Tests/PackageLoadingTests/PD_4_0_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_4_0_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageLoadingTests/PD_4_2_LoadingTests.swift b/Tests/PackageLoadingTests/PD_4_2_LoadingTests.swift
index b1ceabad5a5..a2e325a6de2 100644
--- a/Tests/PackageLoadingTests/PD_4_2_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_4_2_LoadingTests.swift
@@ -14,7 +14,7 @@ import Basics
 import Dispatch
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageLoadingTests/PD_5_0_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_0_LoadingTests.swift
index 3ef6ec21012..58746bfb776 100644
--- a/Tests/PackageLoadingTests/PD_5_0_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_5_0_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCBasic.ByteString
diff --git a/Tests/PackageLoadingTests/PD_5_2_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_2_LoadingTests.swift
index 67e7ef27405..108483c64a9 100644
--- a/Tests/PackageLoadingTests/PD_5_2_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_5_2_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class PackageDescription5_2LoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageLoadingTests/PD_5_3_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_3_LoadingTests.swift
index 555b382d5a6..27bbab812d4 100644
--- a/Tests/PackageLoadingTests/PD_5_3_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_5_3_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageModel
 import PackageLoading
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import enum TSCBasic.PathValidationError
diff --git a/Tests/PackageLoadingTests/PD_5_4_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_4_LoadingTests.swift
index 2e39b3db248..0e00c466586 100644
--- a/Tests/PackageLoadingTests/PD_5_4_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_5_4_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 class PackageDescription5_4LoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageLoadingTests/PD_5_5_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_5_LoadingTests.swift
index d94c0600ed8..87ffa52e2d6 100644
--- a/Tests/PackageLoadingTests/PD_5_5_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_5_5_LoadingTests.swift
@@ -14,7 +14,7 @@ import Basics
 import Foundation
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 class PackageDescription5_5LoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageLoadingTests/PD_5_6_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_6_LoadingTests.swift
index 8abb54efe97..ff7d26a11d0 100644
--- a/Tests/PackageLoadingTests/PD_5_6_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_5_6_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class PackageDescription5_6LoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageLoadingTests/PD_5_7_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_7_LoadingTests.swift
index 981eca47913..335c861263b 100644
--- a/Tests/PackageLoadingTests/PD_5_7_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_5_7_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class PackageDescription5_7LoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageLoadingTests/PD_5_9_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_9_LoadingTests.swift
index 88f712c2ceb..6d2fb323d56 100644
--- a/Tests/PackageLoadingTests/PD_5_9_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_5_9_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class PackageDescription5_9LoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageLoadingTests/PD_6_0_LoadingTests.swift b/Tests/PackageLoadingTests/PD_6_0_LoadingTests.swift
index 8e6144278bf..68adc17946f 100644
--- a/Tests/PackageLoadingTests/PD_6_0_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_6_0_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class PackageDescription6_0LoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageLoadingTests/PD_Next_LoadingTests.swift b/Tests/PackageLoadingTests/PD_Next_LoadingTests.swift
index f922e03e332..7adc59f0761 100644
--- a/Tests/PackageLoadingTests/PD_Next_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_Next_LoadingTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 class PackageDescriptionNextLoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageLoadingTests/PackageBuilderTests.swift b/Tests/PackageLoadingTests/PackageBuilderTests.swift
index fc38f6ee384..373ce9de4b7 100644
--- a/Tests/PackageLoadingTests/PackageBuilderTests.swift
+++ b/Tests/PackageLoadingTests/PackageBuilderTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageLoadingTests/PkgConfigParserTests.swift b/Tests/PackageLoadingTests/PkgConfigParserTests.swift
index 1e13b86888a..20f5889c2ce 100644
--- a/Tests/PackageLoadingTests/PkgConfigParserTests.swift
+++ b/Tests/PackageLoadingTests/PkgConfigParserTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 @testable import PackageLoading
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCBasic.ByteString
diff --git a/Tests/PackageLoadingTests/PkgConfigTests.swift b/Tests/PackageLoadingTests/PkgConfigTests.swift
index 50bd194d32a..1f37175b200 100644
--- a/Tests/PackageLoadingTests/PkgConfigTests.swift
+++ b/Tests/PackageLoadingTests/PkgConfigTests.swift
@@ -13,7 +13,7 @@
 import Basics
 @testable import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 extension SystemLibraryModule {
diff --git a/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift b/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift
index 9b1538a2906..f37150fd1fa 100644
--- a/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift
+++ b/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift
@@ -14,7 +14,7 @@ import Basics
 import Foundation
 import PackageModel
 import PackageLoading
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageLoadingTests/ToolsVersionParserTests.swift b/Tests/PackageLoadingTests/ToolsVersionParserTests.swift
index 486828a7254..75673959986 100644
--- a/Tests/PackageLoadingTests/ToolsVersionParserTests.swift
+++ b/Tests/PackageLoadingTests/ToolsVersionParserTests.swift
@@ -14,7 +14,7 @@
 import Basics
 import PackageModel
 import PackageLoading
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageLoadingTests/TraitLoadingTests.swift b/Tests/PackageLoadingTests/TraitLoadingTests.swift
index 97ab46c2436..36a5bb89875 100644
--- a/Tests/PackageLoadingTests/TraitLoadingTests.swift
+++ b/Tests/PackageLoadingTests/TraitLoadingTests.swift
@@ -14,7 +14,7 @@
 import Basics
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class TraitLoadingTests: PackageDescriptionLoadingTests {
diff --git a/Tests/PackageModelSyntaxTests/ManifestEditTests.swift b/Tests/PackageModelSyntaxTests/ManifestEditTests.swift
index 0c5db853b0c..b82be6b3c1b 100644
--- a/Tests/PackageModelSyntaxTests/ManifestEditTests.swift
+++ b/Tests/PackageModelSyntaxTests/ManifestEditTests.swift
@@ -12,7 +12,7 @@
 import Basics
 import PackageModel
 import PackageModelSyntax
-import SPMTestSupport
+import _InternalTestSupport
 @_spi(FixItApplier) import SwiftIDEUtils
 import SwiftParser
 import SwiftSyntax
diff --git a/Tests/PackageModelTests/ManifestTests.swift b/Tests/PackageModelTests/ManifestTests.swift
index e29653334cb..ce11e52bc31 100644
--- a/Tests/PackageModelTests/ManifestTests.swift
+++ b/Tests/PackageModelTests/ManifestTests.swift
@@ -12,7 +12,7 @@
 
 import XCTest
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 
 class ManifestTests: XCTestCase {
     func testRequiredTargets() throws {
diff --git a/Tests/PackageModelTests/SwiftSDKBundleTests.swift b/Tests/PackageModelTests/SwiftSDKBundleTests.swift
index c98970284fc..34a5760316c 100644
--- a/Tests/PackageModelTests/SwiftSDKBundleTests.swift
+++ b/Tests/PackageModelTests/SwiftSDKBundleTests.swift
@@ -13,7 +13,7 @@
 import Basics
 @_spi(SwiftPMInternal)
 @testable import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCBasic.ByteString
diff --git a/Tests/PackageModelTests/ToolsetTests.swift b/Tests/PackageModelTests/ToolsetTests.swift
index 4755c03e3fa..7a8ca26f484 100644
--- a/Tests/PackageModelTests/ToolsetTests.swift
+++ b/Tests/PackageModelTests/ToolsetTests.swift
@@ -12,7 +12,7 @@
 
 @testable import Basics
 @testable import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageRegistryTests/PackageSigningEntityTOFUTests.swift b/Tests/PackageRegistryTests/PackageSigningEntityTOFUTests.swift
index 2e4c9b34578..1c51607e933 100644
--- a/Tests/PackageRegistryTests/PackageSigningEntityTOFUTests.swift
+++ b/Tests/PackageRegistryTests/PackageSigningEntityTOFUTests.swift
@@ -16,7 +16,7 @@ import Basics
 import PackageModel
 @testable import PackageRegistry
 @testable import PackageSigning
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCUtility.Version
diff --git a/Tests/PackageRegistryTests/PackageVersionChecksumTOFUTests.swift b/Tests/PackageRegistryTests/PackageVersionChecksumTOFUTests.swift
index 028444a9274..5d7e02fdb1d 100644
--- a/Tests/PackageRegistryTests/PackageVersionChecksumTOFUTests.swift
+++ b/Tests/PackageRegistryTests/PackageVersionChecksumTOFUTests.swift
@@ -15,7 +15,7 @@ import Foundation
 import PackageFingerprint
 import PackageModel
 @testable import PackageRegistry
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCUtility.Version
diff --git a/Tests/PackageRegistryTests/RegistryClientTests.swift b/Tests/PackageRegistryTests/RegistryClientTests.swift
index db027bb4a00..11387351123 100644
--- a/Tests/PackageRegistryTests/RegistryClientTests.swift
+++ b/Tests/PackageRegistryTests/RegistryClientTests.swift
@@ -17,7 +17,7 @@ import PackageLoading
 import PackageModel
 @testable import PackageRegistry
 import PackageSigning
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import protocol TSCBasic.HashAlgorithm
diff --git a/Tests/PackageRegistryTests/RegistryConfigurationTests.swift b/Tests/PackageRegistryTests/RegistryConfigurationTests.swift
index 93375acf908..f413b4f31fe 100644
--- a/Tests/PackageRegistryTests/RegistryConfigurationTests.swift
+++ b/Tests/PackageRegistryTests/RegistryConfigurationTests.swift
@@ -13,7 +13,7 @@
 import Foundation
 import PackageModel
 import PackageRegistry
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 private let defaultRegistryBaseURL = URL("https://packages.example.com/")
diff --git a/Tests/PackageRegistryTests/RegistryDownloadsManagerTests.swift b/Tests/PackageRegistryTests/RegistryDownloadsManagerTests.swift
index 75919374b76..fab603ab453 100644
--- a/Tests/PackageRegistryTests/RegistryDownloadsManagerTests.swift
+++ b/Tests/PackageRegistryTests/RegistryDownloadsManagerTests.swift
@@ -14,7 +14,7 @@ import Basics
 import PackageModel
 import PackageLoading
 @testable import PackageRegistry
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageRegistryTests/SignatureValidationTests.swift b/Tests/PackageRegistryTests/SignatureValidationTests.swift
index dad052ba09f..1e172d62682 100644
--- a/Tests/PackageRegistryTests/SignatureValidationTests.swift
+++ b/Tests/PackageRegistryTests/SignatureValidationTests.swift
@@ -15,7 +15,7 @@ import Foundation
 import PackageModel
 @testable import PackageRegistry
 import PackageSigning
-import SPMTestSupport
+import _InternalTestSupport
 import X509 // FIXME: need this import or else SwiftSigningIdentity init crashes
 import XCTest
 
diff --git a/Tests/PackageSigningTests/FilePackageSigningEntityStorageTests.swift b/Tests/PackageSigningTests/FilePackageSigningEntityStorageTests.swift
index b5805f2e23a..e67fd403852 100644
--- a/Tests/PackageSigningTests/FilePackageSigningEntityStorageTests.swift
+++ b/Tests/PackageSigningTests/FilePackageSigningEntityStorageTests.swift
@@ -15,7 +15,7 @@ import Foundation
 import Basics
 import PackageModel
 @testable import PackageSigning
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import class TSCBasic.InMemoryFileSystem
diff --git a/Tests/PackageSigningTests/SigningEntityTests.swift b/Tests/PackageSigningTests/SigningEntityTests.swift
index ba4cbb2bb6c..e53aa99975b 100644
--- a/Tests/PackageSigningTests/SigningEntityTests.swift
+++ b/Tests/PackageSigningTests/SigningEntityTests.swift
@@ -14,7 +14,7 @@ import XCTest
 
 import Basics
 @testable import PackageSigning
-import SPMTestSupport
+import _InternalTestSupport
 import X509
 
 final class SigningEntityTests: XCTestCase {
diff --git a/Tests/PackageSigningTests/SigningIdentityTests.swift b/Tests/PackageSigningTests/SigningIdentityTests.swift
index 928cc6879ae..0f32499ba8d 100644
--- a/Tests/PackageSigningTests/SigningIdentityTests.swift
+++ b/Tests/PackageSigningTests/SigningIdentityTests.swift
@@ -16,7 +16,7 @@ import _CryptoExtras // For RSA
 import Basics
 import Crypto
 @testable import PackageSigning
-import SPMTestSupport
+import _InternalTestSupport
 import X509
 
 final class SigningIdentityTests: XCTestCase {
diff --git a/Tests/PackageSigningTests/SigningTests.swift b/Tests/PackageSigningTests/SigningTests.swift
index de83d3630f3..1e045ff7b33 100644
--- a/Tests/PackageSigningTests/SigningTests.swift
+++ b/Tests/PackageSigningTests/SigningTests.swift
@@ -15,7 +15,7 @@ import Basics
 import Crypto
 import Foundation
 @testable import PackageSigning
-import SPMTestSupport
+import _InternalTestSupport
 import SwiftASN1
 @testable import X509 // need internal APIs for OCSP testing
 import XCTest
diff --git a/Tests/QueryEngineTests/QueryEngineTests.swift b/Tests/QueryEngineTests/QueryEngineTests.swift
index 39c92af40d2..cee68069567 100644
--- a/Tests/QueryEngineTests/QueryEngineTests.swift
+++ b/Tests/QueryEngineTests/QueryEngineTests.swift
@@ -14,7 +14,7 @@ import class Basics.ObservabilitySystem
 import struct Foundation.Data
 @testable import QueryEngine
 import struct SystemPackage.FilePath
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 private let encoder = JSONEncoder()
diff --git a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift
index c9a0d74311b..f6f5b5c42ea 100644
--- a/Tests/SPMBuildCoreTests/PluginInvocationTests.swift
+++ b/Tests/SPMBuildCoreTests/PluginInvocationTests.swift
@@ -21,7 +21,7 @@ import PackageLoading
 import PackageModel
 
 @testable import SPMBuildCore
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/SourceControlTests/GitRepositoryProviderTests.swift b/Tests/SourceControlTests/GitRepositoryProviderTests.swift
index ebe3a01eec6..4c2699a809d 100644
--- a/Tests/SourceControlTests/GitRepositoryProviderTests.swift
+++ b/Tests/SourceControlTests/GitRepositoryProviderTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import SPMTestSupport
+import _InternalTestSupport
 @testable import SourceControl
 import XCTest
 
diff --git a/Tests/SourceControlTests/GitRepositoryTests.swift b/Tests/SourceControlTests/GitRepositoryTests.swift
index d1d60079558..3ab25a71f65 100644
--- a/Tests/SourceControlTests/GitRepositoryTests.swift
+++ b/Tests/SourceControlTests/GitRepositoryTests.swift
@@ -13,7 +13,7 @@
 @_spi(ProcessEnvironmentBlockShim)
 import Basics
 @testable import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 import struct TSCBasic.FileSystemError
diff --git a/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift b/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift
index cef996045e2..f9245502f52 100644
--- a/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift
+++ b/Tests/SourceControlTests/InMemoryGitRepositoryTests.swift
@@ -12,7 +12,7 @@
 
 import Basics
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 class InMemoryGitRepositoryTests: XCTestCase {
diff --git a/Tests/SourceControlTests/RepositoryManagerTests.swift b/Tests/SourceControlTests/RepositoryManagerTests.swift
index 4bbcda06da8..00381fd9367 100644
--- a/Tests/SourceControlTests/RepositoryManagerTests.swift
+++ b/Tests/SourceControlTests/RepositoryManagerTests.swift
@@ -12,7 +12,7 @@
 
 @testable import Basics
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 @testable import SourceControl
 import XCTest
 
diff --git a/Tests/SourceKitLSPAPITests/SourceKitLSPAPITests.swift b/Tests/SourceKitLSPAPITests/SourceKitLSPAPITests.swift
index aaa3a60eaa6..4bc203acd2f 100644
--- a/Tests/SourceKitLSPAPITests/SourceKitLSPAPITests.swift
+++ b/Tests/SourceKitLSPAPITests/SourceKitLSPAPITests.swift
@@ -18,7 +18,7 @@ import PackageGraph
 
 import PackageModel
 import SourceKitLSPAPI
-import SPMTestSupport
+import _InternalTestSupport
 import XCTest
 
 final class SourceKitLSPAPITests: XCTestCase {
diff --git a/Tests/WorkspaceTests/AuthorizationProviderTests.swift b/Tests/WorkspaceTests/AuthorizationProviderTests.swift
index 07c9116bed8..8ac34aabab3 100644
--- a/Tests/WorkspaceTests/AuthorizationProviderTests.swift
+++ b/Tests/WorkspaceTests/AuthorizationProviderTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/WorkspaceTests/InitTests.swift b/Tests/WorkspaceTests/InitTests.swift
index a04a03f51d7..98d5498e603 100644
--- a/Tests/WorkspaceTests/InitTests.swift
+++ b/Tests/WorkspaceTests/InitTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import PackageModel
 import Workspace
 import XCTest
diff --git a/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift b/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift
index 1833c2bd8c2..0994200074c 100644
--- a/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift
+++ b/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift
@@ -14,7 +14,7 @@ import Basics
 import PackageGraph
 import PackageLoading
 import PackageModel
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/WorkspaceTests/MirrorsConfigurationTests.swift b/Tests/WorkspaceTests/MirrorsConfigurationTests.swift
index 84a1fec495d..ff94bbc4ee1 100644
--- a/Tests/WorkspaceTests/MirrorsConfigurationTests.swift
+++ b/Tests/WorkspaceTests/MirrorsConfigurationTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import SPMTestSupport
+import _InternalTestSupport
 import Workspace
 import XCTest
 
diff --git a/Tests/WorkspaceTests/PinsStoreTests.swift b/Tests/WorkspaceTests/PinsStoreTests.swift
index e32c14aa77a..3dedbcf82e1 100644
--- a/Tests/WorkspaceTests/PinsStoreTests.swift
+++ b/Tests/WorkspaceTests/PinsStoreTests.swift
@@ -13,7 +13,7 @@
 import Basics
 import PackageModel
 import PackageGraph
-import SPMTestSupport
+import _InternalTestSupport
 import SourceControl
 import Workspace
 import XCTest
diff --git a/Tests/WorkspaceTests/RegistryPackageContainerTests.swift b/Tests/WorkspaceTests/RegistryPackageContainerTests.swift
index 4ff02d352b3..b0afcd52560 100644
--- a/Tests/WorkspaceTests/RegistryPackageContainerTests.swift
+++ b/Tests/WorkspaceTests/RegistryPackageContainerTests.swift
@@ -16,7 +16,7 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import PackageRegistry
-import SPMTestSupport
+import _InternalTestSupport
 @testable import Workspace
 import XCTest
 
diff --git a/Tests/WorkspaceTests/SourceControlPackageContainerTests.swift b/Tests/WorkspaceTests/SourceControlPackageContainerTests.swift
index 7da82c28cd1..f21afdb77ec 100644
--- a/Tests/WorkspaceTests/SourceControlPackageContainerTests.swift
+++ b/Tests/WorkspaceTests/SourceControlPackageContainerTests.swift
@@ -16,7 +16,7 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import SourceControl
-import SPMTestSupport
+import _InternalTestSupport
 @testable import Workspace
 import XCTest
 
diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift
index f5a6ff50d33..235a628af7f 100644
--- a/Tests/WorkspaceTests/WorkspaceTests.swift
+++ b/Tests/WorkspaceTests/WorkspaceTests.swift
@@ -19,7 +19,7 @@ import PackageRegistry
 import PackageSigning
 import SourceControl
 import SPMBuildCore
-import SPMTestSupport
+import _InternalTestSupport
 @testable import Workspace
 import XCTest
 
diff --git a/Tests/XCBuildSupportTests/PIFBuilderTests.swift b/Tests/XCBuildSupportTests/PIFBuilderTests.swift
index f045ae4e2c2..29216e8ac7c 100644
--- a/Tests/XCBuildSupportTests/PIFBuilderTests.swift
+++ b/Tests/XCBuildSupportTests/PIFBuilderTests.swift
@@ -19,7 +19,7 @@ import PackageGraph
 import PackageLoading
 @testable import PackageModel
 import SPMBuildCore
-import SPMTestSupport
+import _InternalTestSupport
 @testable import XCBuildSupport
 import XCTest
 
diff --git a/Tests/XCBuildSupportTests/PIFTests.swift b/Tests/XCBuildSupportTests/PIFTests.swift
index ec9abb37eaa..13d650fc63f 100644
--- a/Tests/XCBuildSupportTests/PIFTests.swift
+++ b/Tests/XCBuildSupportTests/PIFTests.swift
@@ -15,7 +15,7 @@ import Basics
 import PackageModel
 import SPMBuildCore
 import XCBuildSupport
-import SPMTestSupport
+import _InternalTestSupport
 
 import enum TSCBasic.JSON