diff --git a/tests/context/mod.rs b/tests/context/mod.rs
index 9cad39e6..ee510684 100644
--- a/tests/context/mod.rs
+++ b/tests/context/mod.rs
@@ -1,10 +1,7 @@
 use {
     self::server::EchoServer,
     async_trait::async_trait,
-    echo_server::{
-        config::Config,
-        state::{ClientStoreArc, NotificationStoreArc, TenantStoreArc},
-    },
+    echo_server::config::Config,
     sqlx::{Pool, Postgres},
     std::{env, sync::Arc},
     test_context::{AsyncTestContext, TestContext},
@@ -19,16 +16,11 @@ pub struct ConfigContext {
 
 pub struct EchoServerContext {
     pub server: EchoServer,
-    pub config: Config,
 }
 
 pub struct StoreContext {
     pub pool: Arc<Pool<Postgres>>,
     pub tenant_pool: Arc<Pool<Postgres>>,
-
-    pub clients: ClientStoreArc,
-    pub notifications: NotificationStoreArc,
-    pub tenants: TenantStoreArc,
 }
 
 impl TestContext for ConfigContext {
@@ -92,9 +84,9 @@ impl TestContext for ConfigContext {
 #[async_trait]
 impl AsyncTestContext for EchoServerContext {
     async fn setup() -> Self {
-        let config = ConfigContext::setup().config;
-        let server = EchoServer::start(ConfigContext::setup().config).await;
-        Self { server, config }
+        Self {
+            server: EchoServer::start(ConfigContext::setup().config).await,
+        }
     }
 
     async fn teardown(mut self) {
@@ -115,9 +107,6 @@ impl AsyncTestContext for StoreContext {
         Self {
             pool: db_arc.clone(),
             tenant_pool: tenant_db_arc.clone(),
-            clients: db_arc.clone(),
-            notifications: db_arc.clone(),
-            tenants: tenant_db_arc.clone(),
         }
     }