diff --git a/src/routes/test/apps-test.js b/src/routes/test/apps-test.js
index 9267c5336..194866762 100644
--- a/src/routes/test/apps-test.js
+++ b/src/routes/test/apps-test.js
@@ -20,7 +20,6 @@ var appdb = require('../../appdb.js'),
     hat = require('../../hat.js'),
     hock = require('hock'),
     http = require('http'),
-    https = require('https'),
     ldap = require('../../ldap.js'),
     net = require('net'),
     nock = require('nock'),
@@ -35,8 +34,7 @@ var appdb = require('../../appdb.js'),
     taskmanager = require('../../taskmanager.js'),
     tokendb = require('../../tokendb.js'),
     url = require('url'),
-    uuid = require('uuid'),
-    _ = require('underscore');
+    uuid = require('uuid');
 
 var SERVER_URL = 'http://localhost:' + constants.PORT;
 
@@ -76,32 +74,6 @@ var user_1_id = null;
 var token = null;
 var token_1 = null;
 
-function startDockerProxy(interceptor, callback) {
-    assert.strictEqual(typeof interceptor, 'function');
-
-    return http.createServer(function (req, res) {
-        if (interceptor(req, res)) return;
-
-        // rejectUnauthorized should not be required but it doesn't work without it
-        var options = _.extend({ }, docker.options, { method: req.method, path: req.url, headers: req.headers, rejectUnauthorized: false });
-        delete options.protocol; // https module doesn't like this key
-        var proto = docker.options.protocol === 'https' ? https : http;
-        var dockerRequest = proto.request(options, function (dockerResponse) {
-            res.writeHead(dockerResponse.statusCode, dockerResponse.headers);
-            dockerResponse.on('error', console.error);
-            dockerResponse.pipe(res, { end: true });
-        });
-
-        req.on('error', console.error);
-        if (!req.readable) {
-            dockerRequest.end();
-        } else {
-            req.pipe(dockerRequest, { end: true });
-        }
-
-    }).listen(5687, callback);
-}
-
 function checkAddons(appEntry, done) {
     async.retry({ times: 15, interval: 3000 }, function (callback) {
         // this was previously written with superagent but it was getting sporadic EPIPE
@@ -227,23 +199,6 @@ function startBox(done) {
                 });
         },
 
-        function (callback) {
-            dockerProxy = startDockerProxy(function interceptor(req, res) {
-                if (req.method === 'POST' && req.url === '/images/create?fromImage=' + encodeURIComponent(TEST_IMAGE_REPO) + '&tag=' + TEST_IMAGE_TAG) {
-                    imageCreated = true;
-                    res.writeHead(200);
-                    res.end();
-                    return true;
-                } else if (req.method === 'DELETE' && req.url === '/images/' + TEST_IMAGE + '?force=false&noprune=false') {
-                    imageDeleted = true;
-                    res.writeHead(200);
-                    res.end();
-                    return true;
-                }
-                return false;
-            }, callback);
-        },
-
         function (callback) {
             process.stdout.write('Waiting for platform to be ready...');
             async.retry({ times: 500, interval: 1000 }, function (retryCallback) {
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index 50fa475c5..811f33d13 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -8,7 +8,6 @@
 
 var appdb = require('../appdb.js'),
     apps = require('../apps.js'),
-    assert = require('assert'),
     async = require('async'),
     constants = require('../constants.js'),
     database = require('../database.js'),
@@ -16,7 +15,6 @@ var appdb = require('../appdb.js'),
     EventEmitter = require('events').EventEmitter,
     expect = require('expect.js'),
     groups = require('../groups.js'),
-    http = require('http'),
     ldapServer = require('../ldap.js'),
     maildb = require('../maildb.js'),
     mailboxdb = require('../mailboxdb.js'),
@@ -82,15 +80,6 @@ var APP_0 = {
     mailboxName: 'some-location-0.app'
 };
 
-var dockerProxy;
-
-function startDockerProxy(interceptor, callback) {
-    assert.strictEqual(typeof interceptor, 'function');
-    assert.strictEqual(typeof callback, 'function');
-
-    return http.createServer(interceptor).listen(5687, callback);
-}
-
 function setup(done) {
     async.series([
         database.initialize.bind(null),
@@ -148,57 +137,7 @@ function setup(done) {
                 groups.addMember.bind(null, GROUP_ID, USER_1.id)
             ], callback);
         }
-    ], function (error) {
-        if (error) return done(error);
-
-        dockerProxy = startDockerProxy(function interceptor(req, res) {
-            var answer = {};
-            var status = 500;
-
-            if (req.method === 'GET' && req.url === '/networks/cloudron') {
-                answer = {
-                    Name: 'cloudron',
-                    Id: 'f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566',
-                    Scope: 'local',
-                    Driver: 'bridge',
-                    IPAM: {
-                        Driver: 'default',
-                        Config: [{
-                            Subnet: '172.18.0.0/16'
-                        }]
-                    },
-                    'Containers': {
-                        someOtherContainerId: {
-                            'EndpointID': 'ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda',
-                            'MacAddress': '02:42:ac:11:00:02',
-                            'IPv4Address': '127.0.0.2/16',
-                            'IPv6Address': ''
-                        },
-                        someContainerId: {
-                            'EndpointID': 'ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda',
-                            'MacAddress': '02:42:ac:11:00:02',
-                            'IPv4Address': '127.0.0.1/16',
-                            'IPv6Address': ''
-                        }
-                    }
-                };
-                status = 200;
-            } else if (req.method === 'GET' && req.url === '/containers/someContainerId/json') {
-                answer = {
-                    Config: {
-                        Labels: {
-                            appId: APP_0.id
-                        }
-                    }
-                };
-                status = 200;
-            }
-
-            res.writeHead(status);
-            res.write(JSON.stringify(answer));
-            res.end();
-        }, done);
-    });
+    ], done);
 }
 
 function cleanup(done) {
@@ -206,9 +145,7 @@ function cleanup(done) {
         ldapServer.stop,
         database._clear,
         database.uninitialize
-    ], function () {
-        dockerProxy.close(function () { done(); }); // some strange error
-    });
+    ], done);
 }
 
 describe('Ldap', function () {