diff --git a/src/directoryserver.js b/src/directoryserver.js
index 8ff061bb5..6cac9da5d 100644
--- a/src/directoryserver.js
+++ b/src/directoryserver.js
@@ -399,7 +399,7 @@ async function stop() {
 
     debug('stopping server');
 
-    gServer.close(); // has no callback
+    await util.promisify(gServer.close.bind(gServer));
     gServer = null;
 }
 
diff --git a/src/ldapserver.js b/src/ldapserver.js
index 29a0551ca..1a4c9b222 100644
--- a/src/ldapserver.js
+++ b/src/ldapserver.js
@@ -707,6 +707,6 @@ async function start() {
 async function stop() {
     if (!gServer) return;
 
-    gServer.close();
+    await util.promisify(gServer.close.bind(gServer));
     gServer = null;
 }
diff --git a/src/test/directoryserver-test.js b/src/test/directoryserver-test.js
index d698288b2..ef1d3056c 100644
--- a/src/test/directoryserver-test.js
+++ b/src/test/directoryserver-test.js
@@ -68,7 +68,6 @@ async function ldapSearch(dn, opts, auth) {
             });
         });
     });
-
 }
 
 describe('Directory Server (LDAP)', function () {
diff --git a/src/test/externalldap-test.js b/src/test/externalldap-test.js
index 2b1511664..938bcd8fb 100644
--- a/src/test/externalldap-test.js
+++ b/src/test/externalldap-test.js
@@ -197,9 +197,11 @@ class LdapServer {
     }
 
     stop(callback) {
-        if (this.#ldapServer) this.#ldapServer.close();
-        this.#ldapServer = null;
-        callback();
+        if (this.#ldapServer) {
+            this.#ldapServer.close(callback);
+        } else {
+            callback();
+        }
     }
 }