diff --git a/common.js b/common.js
index f1ca70e..6d5a80f 100644
--- a/common.js
+++ b/common.js
@@ -3,5 +3,22 @@
 exports = module.exports = {
     TESTAPP_ID: 'io.cloudron.testapp',
     TESTAPP_VERSION : '1.0.2'
+
+    cloudronDomain: cloudronDomain,
+    verifyResponse: verifyResponse
 };
 
+function cloudronDomain(filename) {
+    var r = (Math.random() * 1000).toFixed();
+    return 't-' + path.basename(filename, '-test.js') + '-' + r + '.smartserver.io';
+}
+
+function verifyResponse(res, errorMessage) {
+    if (res.statusCode < 200 || res.statusCode > 299) {
+        console.log('Response error statusCode:%s error:%s body:%s', res.statusCode, res.error, res.body);
+        console.log(errorMessage.red);
+        process.exit(1);
+    }
+}
+
+
diff --git a/test/app-flow-test.js b/test/app-flow-test.js
index 2386e26..165b385 100644
--- a/test/app-flow-test.js
+++ b/test/app-flow-test.js
@@ -21,19 +21,6 @@ require('colors');
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
-function cloudronName() {
-    var r = (Math.random() * 1000).toFixed();
-    return 't-' + path.basename(__filename, '-test.js') + '-' + r + '.smartserver.io';
-}
-
-function verifyResponse(res, errorMessage) {
-    if (res.statusCode < 200 || res.statusCode > 299) {
-        console.log('Response error statusCode:%s error:%s body:%s', res.statusCode, res.error, res.body);
-        console.log(errorMessage.red);
-        process.exit(1);
-    }
-}
-
 describe('Application flow test', function () {
     this.timeout(0);
 
@@ -49,7 +36,7 @@ describe('Application flow test', function () {
 
     it('can query versions', function () {
         res = request.get('https://s3.amazonaws.com/staging-cloudron-releases/versions.json').end();
-        verifyResponse(res);
+        common.verifyResponse(res);
         var boxVersions = Object.keys(res.body).sort(semver.rcompare);
         latestVersion = boxVersions[0];
     });
@@ -61,7 +48,7 @@ describe('Application flow test', function () {
 
     it('can create a cloudron', function () {
         box = appStore.createCloudron({
-            name: cloudronName(),
+            domain: cloudronDomain(__filename),
             zoneName: 'smartserver.io',
             region: 'sfo1',
             size: '512mb',
diff --git a/test/cloudron-backup-test.js b/test/cloudron-backup-test.js
index c12d6b3..61c8465 100644
--- a/test/cloudron-backup-test.js
+++ b/test/cloudron-backup-test.js
@@ -22,19 +22,6 @@ require('colors');
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
-function cloudronName() {
-    var r = (Math.random() * 1000).toFixed();
-    return 't-' + path.basename(__filename, '-test.js') + '-' + r + '.smartserver.io';
-}
-
-function verifyResponse(res, errorMessage) {
-    if (res.statusCode < 200 || res.statusCode > 299) {
-        console.log('Response error statusCode:%s error:%s body:%s', res.statusCode, res.error, res.body);
-        console.log(errorMessage.red);
-        process.exit(1);
-    }
-}
-
 describe('Cloudron backup testing', function () {
     this.timeout(0);
 
@@ -50,7 +37,7 @@ describe('Cloudron backup testing', function () {
 
     it('can query versions', function () {
         res = request.get('https://s3.amazonaws.com/staging-cloudron-releases/versions.json').end();
-        verifyResponse(res);
+        common.verifyResponse(res);
         var boxVersions = Object.keys(res.body).sort(semver.rcompare);
         latestVersion = boxVersions[0];
     });
@@ -62,7 +49,7 @@ describe('Cloudron backup testing', function () {
 
     it('can create a cloudron', function () {
         box = appStore.createCloudron({
-            name: cloudronName(),
+            domain: common.cloudronDomain(__filename),
             zoneName: 'smartserver.io',
             region: 'sfo1',
             size: '512mb',
diff --git a/test/cloudron-update-test.js b/test/cloudron-update-test.js
index 23d424e..d5b25ca 100644
--- a/test/cloudron-update-test.js
+++ b/test/cloudron-update-test.js
@@ -25,19 +25,6 @@ require('colors');
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
-function cloudronName() {
-    var r = (Math.random() * 1000).toFixed();
-    return 't-' + path.basename(__filename, '-test.js') + '-' + r + '.smartserver.io';
-}
-
-function verifyResponse(res, errorMessage) {
-    if (res.statusCode < 200 || res.statusCode > 299) {
-        console.log('Response error statusCode:%s error:%s body:%s', res.statusCode, res.error, res.body);
-        console.log(errorMessage.red);
-        process.exit(1);
-    }
-}
-
 describe('Cloudron update testing', function () {
     this.timeout(0);
 
@@ -53,7 +40,7 @@ describe('Cloudron update testing', function () {
 
     it('can query versions', function () {
         res = request.get('https://s3.amazonaws.com/staging-cloudron-releases/versions.json').end();
-        verifyResponse(res);
+        common.verifyResponse(res);
         var boxVersions = Object.keys(res.body).sort(semver.rcompare);
         fromVersion = boxVersions[1];
         toVersion = boxVersions[0];
@@ -69,7 +56,7 @@ describe('Cloudron update testing', function () {
 
     it('can create a cloudron', function () {
         box = appStore.createCloudron({
-            name: cloudronName(),
+            domain: common.cloudronDomain(__filename),
             zoneName: 'smartserver.io',
             region: 'sfo1',
             size: '512mb',
diff --git a/test/cloudron-user-test.js b/test/cloudron-user-test.js
index 2ca1353..59e1f03 100644
--- a/test/cloudron-user-test.js
+++ b/test/cloudron-user-test.js
@@ -21,19 +21,6 @@ require('colors');
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
-function cloudronName() {
-    var r = (Math.random() * 1000).toFixed();
-    return 't-' + path.basename(__filename, '-test.js') + '-' + r + '.smartserver.io';
-}
-
-function verifyResponse(res, errorMessage) {
-    if (res.statusCode < 200 || res.statusCode > 299) {
-        console.log('Response error statusCode:%s error:%s body:%s', res.statusCode, res.error, res.body);
-        console.log(errorMessage.red);
-        process.exit(1);
-    }
-}
-
 describe('Cloudron user creation testing', function () {
     this.timeout(0);
 
@@ -49,7 +36,7 @@ describe('Cloudron user creation testing', function () {
 
     it('can query versions', function () {
         res = request.get('https://s3.amazonaws.com/staging-cloudron-releases/versions.json').end();
-        verifyResponse(res);
+        common.verifyResponse(res);
         var boxVersions = Object.keys(res.body).sort(semver.rcompare);
         latestVersion = boxVersions[0];
     });
@@ -61,7 +48,7 @@ describe('Cloudron user creation testing', function () {
 
     it('can create a cloudron', function () {
         box = appStore.createCloudron({
-            name: cloudronName(),
+            domain: common.cloudronDomain(__filename),
             zoneName: 'smartserver.io',
             region: 'sfo1',
             size: '512mb',
diff --git a/test/new-user-test.js b/test/new-user-test.js
index 5cb1d61..32ca115 100644
--- a/test/new-user-test.js
+++ b/test/new-user-test.js
@@ -21,19 +21,6 @@ require('colors');
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
-function cloudronName() {
-    var r = (Math.random() * 1000).toFixed();
-    return 't-' + path.basename(__filename, '-test.js') + '-' + r + '.smartserver.io';
-}
-
-function verifyResponse(res, errorMessage) {
-    if (res.statusCode < 200 || res.statusCode > 299) {
-        console.log('Response error statusCode:%s error:%s body:%s', res.statusCode, res.error, res.body);
-        console.log(errorMessage.red);
-        process.exit(1);
-    }
-}
-
 describe('Appstore new user flow', function () {
     this.timeout(0);
 
@@ -49,7 +36,7 @@ describe('Appstore new user flow', function () {
 
     it('can query versions', function () {
         res = request.get('https://s3.amazonaws.com/staging-cloudron-releases/versions.json').end();
-        verifyResponse(res);
+        common.verifyResponse(res);
         var boxVersions = Object.keys(res.body).sort(semver.rcompare);
         latestVersion = boxVersions[0];
     });
@@ -61,7 +48,7 @@ describe('Appstore new user flow', function () {
 
     it('can create a cloudron', function () {
         box = appStore.createCloudron({
-            name: cloudronName(),
+            domain: cloudronDomain(__filename),
             zoneName: 'smartserver.io',
             region: 'sfo1',
             size: '512mb',