diff --git a/tests/js/admin-user-helper.js b/tests/js/admin-user-helper.js
index 83fc5315..a9d1f18b 100644
--- a/tests/js/admin-user-helper.js
+++ b/tests/js/admin-user-helper.js
@@ -1,7 +1,6 @@
 'use strict';
 function node_require(module) {
     return require(module);
-
 }
 let fs = node_require("fs");
 let path = node_require("path");
@@ -11,11 +10,11 @@ const DEFAULT_ADMIN_TOKEN_PATH = path.join(__dirname, "..", "..", "object-server
 const ADMIN_TOKEN_PATH = process.env.ADMIN_TOKEN_PATH || DEFAULT_ADMIN_TOKEN_PATH;
 
 function getAdminToken() {
-  if(fs.existsSync(ADMIN_TOKEN_PATH)) {
-    return fs.readFileSync(ADMIN_TOKEN_PATH, 'utf-8');
-  } else {
-    throw new Error("Missing the file with an admin token: " + ADMIN_TOKEN_PATH);
-  }
+    if (fs.existsSync(ADMIN_TOKEN_PATH)) {
+        return fs.readFileSync(ADMIN_TOKEN_PATH, 'utf-8');
+    } else {
+        throw new Error("Missing the file with an admin token: " + ADMIN_TOKEN_PATH);
+    }
 }
 
 function random(min, max) {
@@ -24,69 +23,70 @@ function random(min, max) {
     return Math.floor(Math.random() * (max - min + 1)) + min;
 }
 
+let newAdminName = 'admin' + random(1, 100000);
+let password = '123';
+
 exports.createAdminUser = function () {
     return new Promise((resolve, reject) => {
-        let isAdminRetryCounter = 0;
-        let newAdminName = 'admin' + random(1, 100000);
-        let password = '123';
         Realm.Sync.User.register('http://localhost:9080', newAdminName, password, (error, user) => {
             if (error) {
                 reject(error);
-            } else {
-                let userIdentity = user.identity;
-                user.logout();
+                return;
+            }
+            let userIdentity = user.identity;
+            user.logout();
 
-                let admin_token_user = Realm.Sync.User.adminUser(getAdminToken());
+            let admin_token_user = Realm.Sync.User.adminUser(getAdminToken());
 
-                const config = {
-                    sync: {
-                        user: admin_token_user,
-                        url: `realm://localhost:9080/__admin`,
-                        error: err => {
-                            const error = new Error('Error opening __admin realm error:' + err.user  + ' url:' + err.url + ' state:' + err.state)
-                            console.log(error);
-                            reject(error);
-                        }
+            const config = {
+                sync: {
+                    user: admin_token_user,
+                    url: `realm://localhost:9080/__admin`,
+                    error: err => {
+                        reject(new Error('Error opening __admin realm error:' + err.user  + ' url:' + err.url + ' state:' + err.state));
                     }
-                };
+                }
+            };
 
-                Realm.open(config).then(realm => {
-                    let pendingAdminUser = realm.objectForPrimaryKey('User', userIdentity);
-                    realm.write(() => {
-                        pendingAdminUser.isAdmin = true;
+            resolve(Realm.open(config));
+        });
+    }).then(realm => {
+        let pendingAdminUser = realm.objectForPrimaryKey('User', userIdentity);
+        realm.write(() => {
+            pendingAdminUser.isAdmin = true;
+        });
+
+        admin_token_user.logout();
+    }).then(() => {
+        return new Promise((resolve, reject) => {
+            let isAdminRetryCounter = 0;
+            let waitForServerToUpdateAdminUser = function () {
+                isAdminRetryCounter++;
+                if (isAdminRetryCounter > 10) {
+                    reject("admin-user-helper: Create admin user timeout");
+                    return;
+                }
+
+                Realm.Sync.User.login('http://localhost:9080', newAdminName, password, (error, newAdminUser) => {
+                    if (error) {
+                        reject(error);
+                        return;
+                    }
+
+                    let isAdmin = newAdminUser.isAdmin;
+                    user.logout();
+                    if (!isAdmin) {
+                        setTimeout(waitForServerToUpdateAdminUser, 500);
+                        return;
+                    }
+
+                    resolve({
+                        username: newAdminName,
+                        password
                     });
-
-                    admin_token_user.logout();
-                }).then(() => {
-                    let waitForServerToUpdateAdminUser = function () {
-                        isAdminRetryCounter++;
-                        if (isAdminRetryCounter > 10) {
-                            reject("admin-user-helper: Create admin user timeout");
-                            return;
-                        }
-
-                        Realm.Sync.User.login('http://localhost:9080', newAdminName, password, (error, newAdminUser) => {
-                            if (error) {
-                                reject(error);
-                            } else {
-                                let isAdmin = newAdminUser.isAdmin;
-                                user.logout();
-                                if (!isAdmin) {
-                                    setTimeout(waitForServerToUpdateAdminUser, 500);
-                                    return;
-                                }
-
-                                resolve({
-                                    username: newAdminName,
-                                    password
-                                });
-                            }
-                        });
-                    }
-
-                    waitForServerToUpdateAdminUser();
                 });
             }
+            waitForServerToUpdateAdminUser();
         });
     });
 }
diff --git a/tests/js/index.js b/tests/js/index.js
index d54534db..c6e97fd5 100644
--- a/tests/js/index.js
+++ b/tests/js/index.js
@@ -81,14 +81,15 @@ exports.prepare = function(done) {
         return;
     }
 
-    let helper = require('./admin-user-helper');
-    helper.createAdminUser().then(userInfo => {
-        global.testAdminUserInfo = userInfo;
-        done();
-    })
-        .catch(error => {
-            console.error("Error running admin-user-helper: " + error);
+    require('./admin-user-helper')
+        .createAdminUser()
+        .then(userInfo => {
+            global.testAdminUserInfo = userInfo;
             done();
+        })
+        .catch(error => {
+            console.error("Error running admin-user-helper", error);
+            done.fail(error);
         });
 };