diff --git a/src/directoryserver.js b/src/directoryserver.js
index de8e2fcd9..c9fb5947b 100644
--- a/src/directoryserver.js
+++ b/src/directoryserver.js
@@ -391,7 +391,7 @@ async function stop() {
 
     debug('stopping server');
 
-    await util.promisify(gServer.close.bind(gServer))();
+    gServer.close(); // has no callback
     gServer = null;
 }
 
diff --git a/src/test/directoryserver-test.js b/src/test/directoryserver-test.js
index e7745be15..e9b9f5c5a 100644
--- a/src/test/directoryserver-test.js
+++ b/src/test/directoryserver-test.js
@@ -68,7 +68,7 @@ async function ldapSearch(dn, opts, auth) {
 
 }
 
-describe('User Directory Ldap', function () {
+describe('Directory Server (LDAP)', function () {
     const { setup, cleanup, admin, user, app, domain } = common;
     let group, group2;
     const mockApp = Object.assign({}, app);