diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 5126c9384c..e338b72e74 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -230,10 +230,12 @@ impl Client {
     #[cfg(any(test, feature = "test-support"))]
     pub fn tear_down(&self) {
         let mut state = self.state.write();
+        state._maintain_connection.take();
         state.message_handlers.clear();
         state.models_by_message_type.clear();
         state.models_by_entity_type_and_remote_id.clear();
         state.entity_id_extractors.clear();
+        self.peer.reset();
     }
 
     #[cfg(any(test, feature = "test-support"))]