diff --git a/crates/gpui/src/executor.rs b/crates/gpui/src/executor.rs
index c828fe3ed4..9c4b9e90e0 100644
--- a/crates/gpui/src/executor.rs
+++ b/crates/gpui/src/executor.rs
@@ -16,8 +16,7 @@ use std::{
 
 use crate::{
     platform::{self, Dispatcher},
-    util::{self, post_inc},
-    MutableAppContext,
+    util, MutableAppContext,
 };
 
 pub enum Foreground {
@@ -450,7 +449,7 @@ impl Foreground {
                 {
                     let mut state = executor.state.lock();
                     let wakeup_at = state.now + duration;
-                    timer_id = post_inc(&mut state.next_timer_id);
+                    timer_id = util::post_inc(&mut state.next_timer_id);
                     state.pending_timers.push((timer_id, wakeup_at, tx));
                 }
 
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 4a988f90b5..dc57c85213 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -491,6 +491,7 @@ pub struct FakeLanguageServer {
     _output_task: Task<Result<()>>,
 }
 
+#[cfg(any(test, feature = "test-support"))]
 type FakeLanguageServerHandlers = Arc<
     Mutex<
         HashMap<