diff --git a/package.json b/package.json
index d38d567..d47552f 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "End to end testing",
   "main": "test.js",
   "scripts": {
-    "test": "DEBUG=superagent-sync,e2e:* ./node_modules/.bin/mocha test/*",
+    "test": "DEBUG=superagent-sync,e2e:* ./node_modules/.bin/mocha --bail test/*",
     "parallel_test": "./node_modules/.bin/parallel-mocha --processes 5 test/*"
   },
   "repository": {
diff --git a/test/app-flow-test.js b/test/app-flow-test.js
index 918d34a..8868891 100644
--- a/test/app-flow-test.js
+++ b/test/app-flow-test.js
@@ -75,7 +75,7 @@ describe('Application flow test', function () {
     });
 
     it('can populate the addons', function () {
-        var res = request.post('https://test-' + box.domain + '/populate_addons').end();
+        var res = request.post('https://' + location + '-' + box.domain + '/popuplate_addons').end();
         assert.strictEqual(res.statusCode, 200);
         assert.strictEqual(res.body.mysql, 'OK');
         assert.strictEqual(res.body.postgresql, 'OK');
@@ -83,7 +83,7 @@ describe('Application flow test', function () {
     });
 
     it('can check the addons', function () {
-        var res = request.post('https://test-' + box.domain + '/check_addons').end();
+        var res = request.post('https://' + location + '-' + box.domain + '/check_addons').end();
         assert.strictEqual(res.statusCode, 200);
         assert.strictEqual(res.body.mysql, 'OK');
         assert.strictEqual(res.body.postgresql, 'OK');
@@ -95,7 +95,7 @@ describe('Application flow test', function () {
     });
 
     it('can check the addons', function () {
-        var res = request.post('https://test-' + box.domain + '/check_addons').end();
+        var res = request.post('https://' + location + '-' + box.domain + '/check_addons').end();
         assert.strictEqual(res.statusCode, 200);
         assert.strictEqual(res.body.mysql, 'OK');
         assert.strictEqual(res.body.postgresql, 'OK');
diff --git a/test/update-test.js b/test/update-test.js
index 1f35575..458aea1 100644
--- a/test/update-test.js
+++ b/test/update-test.js
@@ -78,7 +78,7 @@ describe('Cloudron update testing', function () {
     });
 
     it('can populate the addons', function () {
-        var res = request.post('https://test-' + box.domain + '/populate_addons').end();
+        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');
@@ -86,7 +86,7 @@ describe('Cloudron update testing', function () {
     });
 
     it('can check the addons', function () {
-        var res = request.post('https://test-' + box.domain + '/check_addons').end();
+        var res = request.post('https://' + location + '-' + box.domain + '/check_addons').end();
         assert.strictEqual(res.statusCode, 200);
         assert.strictEqual(res.body.mysql, 'OK');
         assert.strictEqual(res.body.postgresql, 'OK');
@@ -98,7 +98,7 @@ describe('Cloudron update testing', function () {
     });
 
     it('can check the addons', function () {
-        var res = request.post('https://test-' + box.domain + '/check_addons').end();
+        var res = request.post('https://' + location + '-' + box.domain + '/check_addons').end();
         assert.strictEqual(res.statusCode, 200);
         assert.strictEqual(res.body.mysql, 'OK');
         assert.strictEqual(res.body.postgresql, 'OK');