diff --git a/src/test/ldapserver-test.js b/src/test/ldapserver-test.js
index a96c85374..87179493b 100644
--- a/src/test/ldapserver-test.js
+++ b/src/test/ldapserver-test.js
@@ -37,28 +37,29 @@ async function ldapSearch(dn, opts) {
     return new Promise((resolve, reject) => {
         const client = ldap.createClient({ url: 'ldap://127.0.0.1:' + constants.LDAP_PORT });
 
+        function done(error, result) {
+            client.unbind();
+            if (error) reject(error); else resolve(result);
+        }
+
         client.search(dn, opts, function (error, result) {
-            if (error) return reject(error);
+            if (error) return done(error);
 
             let entries = [];
 
             result.on('searchEntry', function (entry) { entries.push(entry.object); });
 
-            result.on('error', function (error) {
-                client.unbind();
-                reject(error);
-            });
+            result.on('error', done);
 
             result.on('end', function (result) {
-                if (result.status !== 0) return reject(new Error(`Unexpected status: ${result.status}`));
-                resolve(entries);
+                if (result.status !== 0) return done(new Error(`Unexpected status: ${result.status}`));
+                done(null, entries);
             });
         });
     });
-
 }
 
-describe('Ldap', function () {
+describe('Ldap Server', function () {
     const { setup, cleanup, admin, user, app, domain, auditSource } = common;
     let group, group2;
     const mockApp = Object.assign({}, app);