diff --git a/src/cloudron.js b/src/cloudron.js
index 730c9eb7b..e6fa16170 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -776,3 +776,4 @@ function checkDiskSpace(callback) {
         callback();
     });
 }
+
diff --git a/src/test/cloudron-test.js b/src/test/cloudron-test.js
new file mode 100644
index 000000000..5c5d2baf3
--- /dev/null
+++ b/src/test/cloudron-test.js
@@ -0,0 +1,36 @@
+/* jslint node:true */
+/* global it:false */
+/* global describe:false */
+/* global before:false */
+/* global after:false */
+
+'use strict';
+
+var async = require('async'),
+    cloudron = require('../cloudron.js'),
+    database = require('../database.js'),
+    expect = require('expect.js');
+
+function setup(done) {
+    async.series([
+        database.initialize.bind(null),
+        database._clear.bind(null)
+    ], done);
+}
+
+function cleanup(done) {
+    database._clear(done);
+}
+
+describe('Cloudron', function () {
+    before(setup);
+    after(cleanup);
+
+    it('can check for disk space', function (done) {
+        cloudron.checkDiskSpace(function (error) {
+            expect(!error).to.be.ok();
+            done();
+        });
+    });
+});
+