diff --git a/yarn-project/p2p/src/service/data_store.test.ts b/yarn-project/p2p/src/service/data_store.test.ts
index e718d6737af..1b3b3da60a8 100644
--- a/yarn-project/p2p/src/service/data_store.test.ts
+++ b/yarn-project/p2p/src/service/data_store.test.ts
@@ -17,6 +17,8 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
 
 import { AztecDatastore } from './data_store.js';
 
+const CLEANUP_TIMEOUT = 30_000;
+
 describe('AztecDatastore with AztecLmdbStore', () => {
   let datastore: AztecDatastore;
   let aztecStore: AztecLmdbStore;
@@ -177,7 +179,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterEach(async () => {
       await cleanup(store);
-    });
+    }, CLEANUP_TIMEOUT);
 
     it('simple', async () => {
       const k = new Key('/z/key');
@@ -213,7 +215,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterEach(async () => {
       await cleanup(store);
-    });
+    }, CLEANUP_TIMEOUT);
 
     it('streaming', async () => {
       const data: Pair[] = [];
@@ -244,7 +246,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterEach(async () => {
       await cleanup(store);
-    });
+    }, CLEANUP_TIMEOUT);
 
     it('simple', async () => {
       const k = new Key('/z/one');
@@ -274,7 +276,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterEach(async () => {
       await cleanup(store);
-    });
+    }, CLEANUP_TIMEOUT);
 
     it('streaming', async () => {
       const k = new Key('/z/one');
@@ -308,7 +310,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterEach(async () => {
       await cleanup(store);
-    }, 10_000);
+    }, CLEANUP_TIMEOUT);
 
     it('simple', async () => {
       const k = new Key('/z/one');
@@ -354,7 +356,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterEach(async () => {
       await cleanup(store);
-    });
+    }, CLEANUP_TIMEOUT);
 
     it('streaming', async () => {
       const data = [];
@@ -390,7 +392,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterEach(async () => {
       await cleanup(store);
-    });
+    }, CLEANUP_TIMEOUT);
 
     it('simple', async () => {
       const b = store.batch();
@@ -481,7 +483,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterAll(async () => {
       await cleanup(store);
-    });
+    }, CLEANUP_TIMEOUT);
 
     tests.forEach(([name, query, expected]) =>
       it(name, async () => {
@@ -604,7 +606,7 @@ export function interfaceDatastoreTests<D extends Datastore = Datastore>(test: I
 
     afterAll(async () => {
       await cleanup(store);
-    });
+    }, CLEANUP_TIMEOUT);
 
     tests.forEach(([name, query, expected]) =>
       it(name, async () => {