diff --git a/test/app-flow-test.js b/test/app-flow-test.js
index cfbffce..e03c75b 100644
--- a/test/app-flow-test.js
+++ b/test/app-flow-test.js
@@ -60,13 +60,7 @@ describe('Application flow test', function () {
     });
 
     it('can populate the addons', function () {
-        var res = request.post('https://' + location + '-' + box.domain + '/populate_addons').end();
-        assert.strictEqual(res.statusCode, 200);
-        assert.strictEqual(res.body.mysql, 'OK');
-        assert.strictEqual(res.body.postgresql, 'OK');
-        assert.strictEqual(res.body.mongodb, 'OK');
-        assert.strictEqual(res.body.localstorage, 'OK');
-        assert.strictEqual(res.body.redis, 'OK');
+        cloudron.populateAddons(location);
     });
 
     it('can check the addons', function () {
diff --git a/test/cloudron-backup-test.js b/test/cloudron-backup-test.js
index 92f7ae0..cb4b78d 100644
--- a/test/cloudron-backup-test.js
+++ b/test/cloudron-backup-test.js
@@ -62,12 +62,7 @@ describe('Cloudron backup testing', function () {
     });
 
     it('can populate the addons', function () {
-        var res = request.post('https://' + location + '-' + box.domain + '/populate_addons').end();
-        assert.strictEqual(res.statusCode, 200);
-        assert.strictEqual(res.body.mysql, 'OK');
-        assert.strictEqual(res.body.postgresql, 'OK');
-        assert.strictEqual(res.body.mongodb, 'OK');
-        assert.strictEqual(res.body.localstorage, 'OK');
+        cloudron.populateAddons(location);
     });
 
     it('can check the addons', function () {
diff --git a/test/cloudron-update-ams3-test.js b/test/cloudron-update-ams3-test.js
index d7f2fa3..6a34672 100644
--- a/test/cloudron-update-ams3-test.js
+++ b/test/cloudron-update-ams3-test.js
@@ -77,13 +77,7 @@ describe('Cloudron update testing', function () {
     });
 
     it('can populate the addons', function () {
-        var res = request.post('https://' + location + '-' + box.domain + '/populate_addons').end();
-        assert.strictEqual(res.statusCode, 200);
-        assert.strictEqual(res.body.mysql, 'OK');
-        assert.strictEqual(res.body.postgresql, 'OK');
-        assert.strictEqual(res.body.mongodb, 'OK');
-        assert.strictEqual(res.body.localstorage, 'OK');
-        assert.strictEqual(res.body.redis, 'OK');
+        cloudron.populateAddons(location);
     });
 
     it('can check the addons', function () {
diff --git a/test/cloudron-update-sfo1-test.js b/test/cloudron-update-sfo1-test.js
index f2449dc..1d27f6d 100644
--- a/test/cloudron-update-sfo1-test.js
+++ b/test/cloudron-update-sfo1-test.js
@@ -77,13 +77,7 @@ describe('Cloudron update testing', function () {
     });
 
     it('can populate the addons', function () {
-        var res = request.post('https://' + location + '-' + box.domain + '/populate_addons').end();
-        assert.strictEqual(res.statusCode, 200);
-        assert.strictEqual(res.body.mysql, 'OK');
-        assert.strictEqual(res.body.postgresql, 'OK');
-        assert.strictEqual(res.body.mongodb, 'OK');
-        assert.strictEqual(res.body.localstorage, 'OK');
-        assert.strictEqual(res.body.redis, 'OK');
+        cloudron.populateAddons(location);
     });
 
     it('can check the addons', function () {
diff --git a/test/custom-domain-test.js b/test/custom-domain-test.js
index 5a48150..dce8e95 100644
--- a/test/custom-domain-test.js
+++ b/test/custom-domain-test.js
@@ -111,13 +111,7 @@ describe('Custom domain test', function () {
     });
 
     it('can populate the addons', function () {
-        var res = request.post('https://' + location + '.' + box.domain + '/populate_addons').end();
-        assert.strictEqual(res.statusCode, 200);
-        assert.strictEqual(res.body.mysql, 'OK');
-        assert.strictEqual(res.body.postgresql, 'OK');
-        assert.strictEqual(res.body.mongodb, 'OK');
-        assert.strictEqual(res.body.localstorage, 'OK');
-        assert.strictEqual(res.body.redis, 'OK');
+        cloudron.populateAddons(location);
     });
 
     it('can check the addons', function () {