diff --git a/package.json b/package.json
index ad978bd..29a638a 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "description": "End to end testing",
   "main": "test.js",
   "scripts": {
-    "test": "DEBUG=superagent-sync,e2e mocha test.js"
+    "test": "DEBUG=superagent-sync,e2e:* ./node_modules/.bin/mocha test/*",
+    "parallel_test": "./node_modules/.bin/parallel-mocha test/*"
   },
   "repository": {
     "type": "git",
@@ -16,6 +17,7 @@
     "colors": "^1.1.0",
     "debug": "^2.2.0",
     "mocha": "^2.2.5",
+    "parallel-mocha": "0.0.7",
     "readline-sync": "^1.2.19",
     "semver": "^4.3.6",
     "should": "^6.0.3",
diff --git a/test/new-user-test.js b/test/new-user-test.js
new file mode 100644
index 0000000..451eac2
--- /dev/null
+++ b/test/new-user-test.js
@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+'use strict';
+
+var AppStore = require('../appstore.js'),
+    assert = require('assert'),
+    Cloudron = require('../cloudron.js'),
+    readlineSync = require('readline-sync'),
+    request = require('superagent-sync'),
+    semver = require('semver'),
+    sleep = require('sleep').sleep,
+    util = require('util');
+
+require('colors');
+
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+
+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('End to end testing', function () {
+    this.timeout(0);
+
+    var appStore = new AppStore('https://api.staging.cloudron.io');
+
+    var owner = {
+        username: 'test',
+        password: 'test1234',
+        email: 'test@cloudron.io'
+    };
+
+    var res, latestVersion, cloudron, appId, box;
+
+    it('can query versions', function () {
+        res = request.get('https://s3.amazonaws.com/staging-cloudron-releases/versions.json').end();
+        verifyResponse(res);
+        var boxVersions = Object.keys(res.body).sort(semver.rcompare);
+        latestVersion = boxVersions[0];
+    });
+
+    it('can login to the store', function () {
+        var accessToken = appStore.getAccessToken(owner);
+        appStore.setCredentials(owner.password, accessToken);
+    });
+
+    it('can create a cloudron', function () {
+        box = appStore.createCloudron({
+            name: 'testbox' + (Math.random() * 1000).toFixed() + '.smartserver.io',
+            zoneName: 'smartserver.io',
+            region: 'sfo1',
+            size: '512mb',
+            version: latestVersion
+        });
+        cloudron = new Cloudron(box);
+    });
+
+    it('can activate the box', function () {
+        cloudron.activate(owner);
+    });
+
+    it('can login to the box', function () {
+        var token = cloudron.getOauthToken(owner);
+        cloudron.setCredentials(owner.password, token);
+    });
+
+    var location = 'haste' + (Math.random() * 10000).toFixed();
+    it('can install app', function () {
+        var manifest = appStore.getManifest('com.hastebin.cloudronapp', '0.1.0');
+        appId = cloudron.installApp(location, manifest);
+    });
+
+    it('can configure app', function () {
+        cloudron.configureApp(appId, location + 'x');
+    });
+
+    it('can uninstall app', function () {
+        cloudron.uninstallApp(appId);
+    });
+
+    it('can delete the cloudron', function () {
+        appStore.deleteCloudron(box);
+    });
+
+});
+
diff --git a/test.js b/test/update-test.js
old mode 100755
new mode 100644
similarity index 97%
rename from test.js
rename to test/update-test.js
index db99300..348f954
--- a/test.js
+++ b/test/update-test.js
@@ -2,9 +2,9 @@
 
 'use strict';
 
-var AppStore = require('./appstore.js'),
+var AppStore = require('../appstore.js'),
     assert = require('assert'),
-    Cloudron = require('./cloudron.js'),
+    Cloudron = require('../cloudron.js'),
     readlineSync = require('readline-sync'),
     request = require('superagent-sync'),
     semver = require('semver'),