1 files changed, 9 insertions, 11 deletions

diff --git a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts b/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts
index 344d4bdbb..f8a271cba 100644
--- a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts
+++ b/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts
@@ -1,7 +1,6 @@
 import express, { Request, Response } from 'express'
 import { Server } from 'http'
-import { randomInt } from '@shared/core-utils'
-import { terminateServer } from './utils'
+import { getPort, randomListen, terminateServer } from './utils'
 
 type BlocklistResponse = {
   data: {
@@ -15,17 +14,16 @@ export class MockBlocklist {
   private body: BlocklistResponse
   private server: Server
 
-  initialize () {
-    return new Promise<number>(res => {
-      const app = express()
+  async initialize () {
+    const app = express()
 
-      app.get('/blocklist', (req: Request, res: Response) => {
-        return res.json(this.body)
-      })
-
-      const port = 45000 + randomInt(1, 1000)
-      this.server = app.listen(port, () => res(port))
+    app.get('/blocklist', (req: Request, res: Response) => {
+      return res.json(this.body)
     })
+
+    this.server = await randomListen(app)
+
+    return getPort(this.server)
   }
 
   replace (body: BlocklistResponse) {