diff --git a/Sources/BuildServerProtocol/SupportTypes/BuildTarget.swift b/Sources/BuildServerProtocol/SupportTypes/BuildTarget.swift
index 0f147862..128d9b3d 100644
--- a/Sources/BuildServerProtocol/SupportTypes/BuildTarget.swift
+++ b/Sources/BuildServerProtocol/SupportTypes/BuildTarget.swift
@@ -68,9 +68,9 @@ public struct BuildTarget: Codable, Hashable, Sendable {
 
   public init(
     id: BuildTargetIdentifier,
-    displayName: String?,
-    baseDirectory: URI?,
-    tags: [BuildTargetTag],
+    displayName: String? = nil,
+    baseDirectory: URI? = nil,
+    tags: [BuildTargetTag] = [],
     capabilities: BuildTargetCapabilities,
     languageIds: [Language],
     dependencies: [BuildTargetIdentifier],
diff --git a/Sources/BuildSystemIntegration/FixedCompilationDatabaseBuildSystem.swift b/Sources/BuildSystemIntegration/FixedCompilationDatabaseBuildSystem.swift
index cfe8b695..78212961 100644
--- a/Sources/BuildSystemIntegration/FixedCompilationDatabaseBuildSystem.swift
+++ b/Sources/BuildSystemIntegration/FixedCompilationDatabaseBuildSystem.swift
@@ -84,8 +84,6 @@ package actor FixedCompilationDatabaseBuildSystem: BuiltInBuildSystem {
     return WorkspaceBuildTargetsResponse(targets: [
       BuildTarget(
         id: .dummy,
-        displayName: nil,
-        baseDirectory: nil,
         tags: [.test],
         capabilities: BuildTargetCapabilities(),
         // Be conservative with the languages that might be used in the target. SourceKit-LSP doesn't use this property.
diff --git a/Sources/BuildSystemIntegration/JSONCompilationDatabaseBuildSystem.swift b/Sources/BuildSystemIntegration/JSONCompilationDatabaseBuildSystem.swift
index 90c3f2f5..67bcb7fa 100644
--- a/Sources/BuildSystemIntegration/JSONCompilationDatabaseBuildSystem.swift
+++ b/Sources/BuildSystemIntegration/JSONCompilationDatabaseBuildSystem.swift
@@ -102,8 +102,6 @@ package actor JSONCompilationDatabaseBuildSystem: BuiltInBuildSystem {
         }
       return BuildTarget(
         id: try BuildTargetIdentifier.createCompileCommands(compiler: compiler),
-        displayName: nil,
-        baseDirectory: nil,
         tags: [.test],
         capabilities: BuildTargetCapabilities(),
         // Be conservative with the languages that might be used in the target. SourceKit-LSP doesn't use this property.
diff --git a/Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift b/Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift
index 8f7090db..4e11c20a 100644
--- a/Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift
+++ b/Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift
@@ -145,7 +145,6 @@ actor LegacyBuildServerBuildSystem: MessageHandler, BuiltInBuildSystem {
       BuildTarget(
         id: .dummy,
         displayName: "BuildServer",
-        baseDirectory: nil,
         tags: [.test],
         capabilities: BuildTargetCapabilities(),
         // Be conservative with the languages that might be used in the target. SourceKit-LSP doesn't use this property.
diff --git a/Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift b/Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
index 100d15e0..fc326b5a 100644
--- a/Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
+++ b/Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
@@ -512,7 +512,6 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
       return BuildTarget(
         id: targetId,
         displayName: target.name,
-        baseDirectory: nil,
         tags: tags,
         capabilities: BuildTargetCapabilities(),
         // Be conservative with the languages that might be used in the target. SourceKit-LSP doesn't use this property.
@@ -526,7 +525,6 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
       BuildTarget(
         id: .forPackageManifest,
         displayName: "Package.swift",
-        baseDirectory: nil,
         tags: [.notBuildable],
         capabilities: BuildTargetCapabilities(),
         languageIds: [.swift],
diff --git a/Sources/SKTestSupport/CustomBuildServerTestProject.swift b/Sources/SKTestSupport/CustomBuildServerTestProject.swift
index 69b4f2eb..d098648e 100644
--- a/Sources/SKTestSupport/CustomBuildServerTestProject.swift
+++ b/Sources/SKTestSupport/CustomBuildServerTestProject.swift
@@ -201,9 +201,6 @@ package extension CustomBuildServer {
     return WorkspaceBuildTargetsResponse(targets: [
       BuildTarget(
         id: .dummy,
-        displayName: nil,
-        baseDirectory: nil,
-        tags: [],
         capabilities: BuildTargetCapabilities(),
         languageIds: [],
         dependencies: []