diff --git a/src/cron.js b/src/cron.js
index 476e2edc0..de97b843f 100644
--- a/src/cron.js
+++ b/src/cron.js
@@ -18,12 +18,12 @@ var appHealthMonitor = require('./apphealthmonitor.js'),
     constants = require('./constants.js'),
     CronJob = require('cron').CronJob,
     debug = require('debug')('box:cron'),
-    disks = require('./disks.js'),
     dyndns = require('./dyndns.js'),
     eventlog = require('./eventlog.js'),
     janitor = require('./janitor.js'),
     scheduler = require('./scheduler.js'),
     settings = require('./settings.js'),
+    system = require('./system.js'),
     updater = require('./updater.js'),
     updateChecker = require('./updatechecker.js');
 
@@ -116,7 +116,7 @@ function recreateJobs(tz) {
     if (gJobs.diskSpaceChecker) gJobs.diskSpaceChecker.stop();
     gJobs.diskSpaceChecker = new CronJob({
         cronTime: '00 30 * * * *', // every 30 minutes. if you change this interval, change the notification messages with correct duration
-        onTick: () => disks.checkDiskSpace(NOOP_CALLBACK),
+        onTick: () => system.checkDiskSpace(NOOP_CALLBACK),
         start: true,
         runOnInit: true, // run system check immediately
         timeZone: tz
diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js
index b265b9a32..d65cb8309 100644
--- a/src/routes/cloudron.js
+++ b/src/routes/cloudron.js
@@ -24,11 +24,11 @@ let assert = require('assert'),
     BoxError = require('../boxerror.js'),
     cloudron = require('../cloudron.js'),
     custom = require('../custom.js'),
-    disks = require('../disks.js'),
     externalLdap = require('../externalldap.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     sysinfo = require('../sysinfo.js'),
+    system = require('../system.js'),
     updater = require('../updater.js'),
     updateChecker = require('../updatechecker.js');
 
@@ -56,7 +56,7 @@ function getConfig(req, res, next) {
 }
 
 function getDisks(req, res, next) {
-    disks.getDisks(function (error, result) {
+    system.getDisks(function (error, result) {
         if (error) return next(BoxError.toHttpError(error));
 
         next(new HttpSuccess(200, result));
@@ -64,7 +64,7 @@ function getDisks(req, res, next) {
 }
 
 function getMemory(req, res, next) {
-    disks.getMemory(function (error, result) {
+    system.getMemory(function (error, result) {
         if (error) return next(BoxError.toHttpError(error));
 
         next(new HttpSuccess(200, result));
diff --git a/src/disks.js b/src/system.js
similarity index 100%
rename from src/disks.js
rename to src/system.js
diff --git a/src/test/disks-test.js b/src/test/system-test.js
similarity index 62%
rename from src/test/disks-test.js
rename to src/test/system-test.js
index 05ea439b0..028f017d4 100644
--- a/src/test/disks-test.js
+++ b/src/test/system-test.js
@@ -8,8 +8,8 @@
 
 var async = require('async'),
     database = require('../database.js'),
-    disks = require('../disks.js'),
-    expect = require('expect.js');
+    expect = require('expect.js'),
+    system = require('../system.js');
 
 function setup(done) {
     async.series([
@@ -25,12 +25,12 @@ function cleanup(done) {
     ], done);
 }
 
-describe('Disks', function () {
+describe('System', function () {
     before(setup);
     after(cleanup);
 
     it('can get disks', function (done) {
-        disks.getDisks(function (error, disks) {
+        system.getDisks(function (error, disks) {
             expect(!error).to.be.ok();
             expect(disks).to.be.ok();
             done();
@@ -38,10 +38,19 @@ describe('Disks', function () {
     });
 
     it('can check for disk space', function (done) {
-        disks.checkDiskSpace(function (error) {
+        system.checkDiskSpace(function (error) {
             expect(!error).to.be.ok();
             done();
         });
     });
+
+    it('can get memory', function (done) {
+        system.getMemory(function (error, memory) {
+            expect(!error).to.be.ok();
+            expect(memory.memory).to.be.ok();
+            expect(memory.swap).to.be.ok();
+            done();
+        });
+    });
 });