diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs
index 10df4cee9ee68699bc48954fdf69e5d375a16eb2..65b021413a08bf53909201b39f7fbfcda29a60da 100644
--- a/crates/gpui2/src/app.rs
+++ b/crates/gpui2/src/app.rs
@@ -224,6 +224,8 @@ impl AppContext {
         {
             log::error!("timed out waiting on app_will_quit");
         }
+
+        self.globals_by_type.clear();
     }
 
     pub fn app_metadata(&self) -> AppMetadata {
diff --git a/crates/gpui2/src/app/test_context.rs b/crates/gpui2/src/app/test_context.rs
index c4f9abd7cb50aa6dda105502cb5f55f86b462e3a..9f76d316c9b62715cadc5c12751a402e73025d88 100644
--- a/crates/gpui2/src/app/test_context.rs
+++ b/crates/gpui2/src/app/test_context.rs
@@ -48,12 +48,8 @@ impl TestAppContext {
         }
     }
 
-    pub fn remove_all_windows(&self) {
-        // todo!("use app quit instead")
-    }
-
-    pub fn clear_globals(&self) {
-        // todo!("use app quit instead")
+    pub fn quit(&self) {
+        self.app.lock().quit();
     }
 
     pub fn refresh(&mut self) -> Result<()> {
diff --git a/crates/gpui2/src/platform/mac/window.rs b/crates/gpui2/src/platform/mac/window.rs
index a5b0223c9019816d8016f7dd7e3189aed979df7b..dbdb60469b3f4f66f8cbad81262b4ecb593a085e 100644
--- a/crates/gpui2/src/platform/mac/window.rs
+++ b/crates/gpui2/src/platform/mac/window.rs
@@ -1,6 +1,6 @@
 use super::{display_bounds_from_native, ns_string, MacDisplay, MetalRenderer, NSRange};
 use crate::{
-    display_bounds_to_native, point, px, size, AnyWindowHandle, Bounds, ExternalPaths, Executor,
+    display_bounds_to_native, point, px, size, AnyWindowHandle, Bounds, Executor, ExternalPaths,
     FileDropEvent, GlobalPixels, InputEvent, KeyDownEvent, Keystroke, Modifiers,
     ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels,
     PlatformAtlas, PlatformDisplay, PlatformInputHandler, PlatformWindow, Point, Scene, Size,
diff --git a/crates/gpui2_macros/src/test.rs b/crates/gpui2_macros/src/test.rs
index cbab11fcd05e5e085d3139bd4b52ba544f770c8e..20e993059cf1179d52a4084ab6a64cc0407ba7f1 100644
--- a/crates/gpui2_macros/src/test.rs
+++ b/crates/gpui2_macros/src/test.rs
@@ -3,8 +3,8 @@ use proc_macro2::Ident;
 use quote::{format_ident, quote};
 use std::mem;
 use syn::{
-    parse_macro_input, parse_quote, spanned::Spanned as _, AttributeArgs, FnArg,
-    ItemFn, Lit, Meta, NestedMeta, Type,
+    parse_macro_input, parse_quote, spanned::Spanned as _, AttributeArgs, FnArg, ItemFn, Lit, Meta,
+    NestedMeta, Type,
 };
 
 pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
@@ -110,9 +110,7 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
                                 );
                             ));
                             cx_teardowns.extend(quote!(
-                                #cx_varname.remove_all_windows();
-                                dispatcher.run_until_parked();
-                                #cx_varname.clear_globals();
+                                #cx_varname.quit();
                                 dispatcher.run_until_parked();
                             ));
                             inner_fn_args.extend(quote!(&mut #cx_varname,));
@@ -176,9 +174,7 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
                                 ));
                                 inner_fn_args.extend(quote!(&mut #cx_varname_lock,));
                                 cx_teardowns.extend(quote!(
-                                    #cx_varname.remove_all_windows();
-                                    dispatcher.run_until_parked();
-                                    #cx_varname.clear_globals();
+                                    #cx_varname.quit();
                                     dispatcher.run_until_parked();
                                 ));
                                 continue;
@@ -191,9 +187,7 @@ pub fn test(args: TokenStream, function: TokenStream) -> TokenStream {
                                     );
                                 ));
                                 cx_teardowns.extend(quote!(
-                                    #cx_varname.remove_all_windows();
-                                    dispatcher.run_until_parked();
-                                    #cx_varname.clear_globals();
+                                    #cx_varname.quit();
                                     dispatcher.run_until_parked();
                                 ));
                                 inner_fn_args.extend(quote!(&mut #cx_varname,));