diff --git a/cloudron.js b/cloudron.js
index 29761a6..be41516 100644
--- a/cloudron.js
+++ b/cloudron.js
@@ -174,3 +174,19 @@ Cloudron.prototype.update = function (toVersion) {
     console.log('Updated successfully'.green);
 }
 
+Cloudron.prototype.addUser = function (username, email) {
+    var res = request.post(this._origin + '/api/v1/users').query({ access_token: this._credentials.accessToken }).send({ username: username, email: email }).end();
+    verifyResponse(res, 'Could not add user');
+
+    return res.body.userInfo;
+};
+
+Cloudron.prototype.resetPassword = function (resetToken, password) {
+    var res = request.get(this._origin + '/api/v1/session/password/setup.html').query({ reset_token: resetToken }).end();
+    verifyResponse(res, 'Could not get password setup site');
+
+    var csrf = res.text.match(/name="_csrf" value="(.*)"/)[1];
+    res = request.post(this._origin + '/api/v1/session/password/reset').type('form').send({ _csrf: csrf, resetToken: resetToken, password: password, passwordRepeat: password }).end();
+    verifyResponse(res, 'Could not setup password for user');
+};
+
diff --git a/test/cloudron-user.js b/test/cloudron-user.js
new file mode 100644
index 0000000..3ed8d82
--- /dev/null
+++ b/test/cloudron-user.js
@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+
+'use strict';
+
+var AppStore = require('../appstore.js'),
+    assert = require('assert'),
+    Cloudron = require('../cloudron.js'),
+    path = require('path'),
+    readlineSync = require('readline-sync'),
+    request = require('superagent-sync'),
+    semver = require('semver'),
+    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, newUser;
+
+    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-' + path.basename(__filename, '-test.js') + '.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);
+    });
+
+    it('can create user', function () {
+        newUser = cloudron.addUser('newuser', 'test@cloudron.io');
+    });
+
+    it('can use reset token to reset password', function () {
+        cloudron.resetPassword(newUser.resetToken, 'newpassword');
+    });
+
+    it('can login as new user', function () {
+        cloudron.getOauthToken({ username: 'newuser', email: 'test@cloudron.io', password: 'newpassword' });
+    });
+
+    it('can delete the cloudron', function () {
+//        appStore.deleteCloudron(box);
+    });
+
+});
+