diff --git a/src/apps.js b/src/apps.js
index 117eef93d..1b506eec0 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -52,7 +52,8 @@ exports = module.exports = {
     // exported for testing
     _validatePortBindings: validatePortBindings,
     _validateAccessRestriction: validateAccessRestriction,
-    _translatePortBindings: translatePortBindings
+    _translatePortBindings: translatePortBindings,
+    _MOCK_GET_BY_IP_APP_ID: ''
 };
 
 var appdb = require('./appdb.js'),
@@ -488,6 +489,8 @@ function getByIpAddress(ip, callback) {
     assert.strictEqual(typeof ip, 'string');
     assert.strictEqual(typeof callback, 'function');
 
+    if (constants.TEST) return get(exports._MOCK_GET_BY_IP_APP_ID, callback);
+
     docker.getContainerIdByIp(ip, function (error, containerId) {
         if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index 811f33d13..59dfc4e41 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -96,7 +96,14 @@ function setup(done) {
                 callback();
             });
         },
-        appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, apps._translatePortBindings(APP_0.portBindings, APP_0.manifest), APP_0),
+        function (callback) {
+            appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, apps._translatePortBindings(APP_0.portBindings, APP_0.manifest), APP_0, function (error) {
+                if (error) return callback(error);
+
+                apps._MOCK_GET_BY_IP_APP_ID = APP_0.id;
+                callback();
+            });
+        },
         (done) => mailboxdb.addMailbox(USER_0.username.toLowerCase(), DOMAIN_0.domain, USER_0.id, done),
         (done) => mailboxdb.setAliasesForName(USER_0.username.toLowerCase(), DOMAIN_0.domain, [ USER_0_ALIAS.toLocaleLowerCase() ], done),
         appdb.update.bind(null, APP_0.id, { containerId: APP_0.containerId }),
@@ -141,6 +148,8 @@ function setup(done) {
 }
 
 function cleanup(done) {
+    apps._MOCK_GET_BY_IP_APP_ID = '';
+
     async.series([
         ldapServer.stop,
         database._clear,