diff --git a/crates/dap/src/adapters.rs b/crates/dap/src/adapters.rs
index 02f5d0482f..594b856439 100644
--- a/crates/dap/src/adapters.rs
+++ b/crates/dap/src/adapters.rs
@@ -100,9 +100,6 @@ pub struct DebugAdapterBinary {
     pub envs: Option<HashMap<String, String>>,
     pub cwd: Option<PathBuf>,
     pub connection: Option<TcpArguments>,
-    #[cfg(any(test, feature = "test-support"))]
-    // todo(debugger) Find a way to remove this. It's a hack for FakeTransport
-    pub is_fake: bool,
 }
 
 pub struct AdapterVersion {
@@ -333,7 +330,6 @@ impl DebugAdapter for FakeAdapter {
             command: "command".into(),
             arguments: None,
             connection: None,
-            is_fake: true,
             envs: None,
             cwd: None,
         })
diff --git a/crates/dap/src/client.rs b/crates/dap/src/client.rs
index 6e163ba4f6..fa228e89ea 100644
--- a/crates/dap/src/client.rs
+++ b/crates/dap/src/client.rs
@@ -106,8 +106,6 @@ impl DebugAdapterClient {
                     port: tcp_transport.port,
                     timeout: Some(tcp_transport.timeout),
                 }),
-                #[cfg(any(test, feature = "test-support"))]
-                is_fake: binary.is_fake,
             },
             _ => self.binary.clone(),
         };
@@ -321,7 +319,6 @@ mod tests {
                 arguments: Default::default(),
                 envs: Default::default(),
                 connection: None,
-                is_fake: true,
                 cwd: None,
             },
             Box::new(|_, _| panic!("Did not expect to hit this code path")),
@@ -389,7 +386,6 @@ mod tests {
                 arguments: Default::default(),
                 envs: Default::default(),
                 connection: None,
-                is_fake: true,
                 cwd: None,
             },
             Box::new({
@@ -439,7 +435,6 @@ mod tests {
                 arguments: Default::default(),
                 envs: Default::default(),
                 connection: None,
-                is_fake: true,
                 cwd: None,
             },
             Box::new({
diff --git a/crates/dap/src/transport.rs b/crates/dap/src/transport.rs
index 8b183459d2..dc63f56a16 100644
--- a/crates/dap/src/transport.rs
+++ b/crates/dap/src/transport.rs
@@ -76,11 +76,9 @@ pub enum Transport {
 impl Transport {
     async fn start(binary: &DebugAdapterBinary, cx: AsyncApp) -> Result<(TransportPipe, Self)> {
         #[cfg(any(test, feature = "test-support"))]
-        if binary.is_fake {
-            return FakeTransport::start(cx)
-                .await
-                .map(|(transports, fake)| (transports, Self::Fake(fake)));
-        }
+        return FakeTransport::start(cx)
+            .await
+            .map(|(transports, fake)| (transports, Self::Fake(fake)));
 
         if binary.connection.is_some() {
             TcpTransport::start(binary, cx)
diff --git a/crates/dap_adapters/src/custom.rs b/crates/dap_adapters/src/custom.rs
index f3de39e0e4..8259ffa072 100644
--- a/crates/dap_adapters/src/custom.rs
+++ b/crates/dap_adapters/src/custom.rs
@@ -50,8 +50,6 @@ impl DebugAdapter for CustomDebugAdapter {
                 .map(|args| args.iter().map(OsString::from).collect()),
             cwd: config.cwd.clone(),
             envs: self.custom_args.envs.clone(),
-            #[cfg(any(test, feature = "test-support"))]
-            is_fake: false,
             connection,
         };
         Ok(ret)
diff --git a/crates/dap_adapters/src/gdb.rs b/crates/dap_adapters/src/gdb.rs
index dd33ba351d..0e3238b900 100644
--- a/crates/dap_adapters/src/gdb.rs
+++ b/crates/dap_adapters/src/gdb.rs
@@ -51,8 +51,6 @@ impl DebugAdapter for GdbDebugAdapter {
             arguments: Some(vec!["-i=dap".into()]),
             envs: None,
             cwd: config.cwd.clone(),
-            #[cfg(any(test, feature = "test-support"))]
-            is_fake: false,
             connection: None,
         })
     }
diff --git a/crates/dap_adapters/src/go.rs b/crates/dap_adapters/src/go.rs
index af3aa54062..94bd64d057 100644
--- a/crates/dap_adapters/src/go.rs
+++ b/crates/dap_adapters/src/go.rs
@@ -87,8 +87,6 @@ impl DebugAdapter for GoDebugAdapter {
                 port: self.port,
                 timeout: self.timeout,
             }),
-            #[cfg(any(test, feature = "test-support"))]
-            is_fake: false,
         })
     }
 
diff --git a/crates/dap_adapters/src/javascript.rs b/crates/dap_adapters/src/javascript.rs
index 06d96b4268..2888c34ff7 100644
--- a/crates/dap_adapters/src/javascript.rs
+++ b/crates/dap_adapters/src/javascript.rs
@@ -94,8 +94,6 @@ impl DebugAdapter for JsDebugAdapter {
             ]),
             cwd: config.cwd.clone(),
             envs: None,
-            #[cfg(any(test, feature = "test-support"))]
-            is_fake: false,
             connection: Some(adapters::TcpArguments {
                 host: self.host,
                 port: self.port,
diff --git a/crates/dap_adapters/src/lldb.rs b/crates/dap_adapters/src/lldb.rs
index 52a0c5adc1..ea262de56b 100644
--- a/crates/dap_adapters/src/lldb.rs
+++ b/crates/dap_adapters/src/lldb.rs
@@ -55,8 +55,6 @@ impl DebugAdapter for LldbDebugAdapter {
             envs: None,
             cwd: config.cwd.clone(),
             connection: None,
-            #[cfg(any(test, feature = "test-support"))]
-            is_fake: false,
         })
     }
 
diff --git a/crates/dap_adapters/src/php.rs b/crates/dap_adapters/src/php.rs
index 6e124f01f2..fa7c02694d 100644
--- a/crates/dap_adapters/src/php.rs
+++ b/crates/dap_adapters/src/php.rs
@@ -91,12 +91,10 @@ impl DebugAdapter for PhpDebugAdapter {
             connection: Some(TcpArguments {
                 port: self.port,
                 host: self.host,
-                timeout: None,
+                timeout: self.timeout,
             }),
             cwd: config.cwd.clone(),
             envs: None,
-            #[cfg(any(test, feature = "test-support"))]
-            is_fake: false,
         })
     }
 
diff --git a/crates/dap_adapters/src/python.rs b/crates/dap_adapters/src/python.rs
index 19ccab074a..03db3f85f9 100644
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -128,8 +128,6 @@ impl DebugAdapter for PythonDebugAdapter {
             }),
             cwd: config.cwd.clone(),
             envs: None,
-            #[cfg(any(test, feature = "test-support"))]
-            is_fake: false,
         })
     }