diff --git a/tests/hashauth.test.js b/tests/hashauth.test.js
index 64412da96df..287b2c45e70 100644
--- a/tests/hashauth.test.js
+++ b/tests/hashauth.test.js
@@ -16,6 +16,8 @@ describe('hashauth', function ( ) {
   });
 
   after(function (done) {
+    // cleanup js-storage as it evaluates if the test is running in the window or not when first required
+    delete require.cache[require.resolve('js-storage')];
     done( );
   });
 
diff --git a/tests/reportstorage.test.js b/tests/reportstorage.test.js
new file mode 100644
index 00000000000..c422ec1c2dc
--- /dev/null
+++ b/tests/reportstorage.test.js
@@ -0,0 +1,60 @@
+const should = require('should');
+const defaultValues = {
+    insulin: true,
+    carbs: true,
+    basal: true,
+    notes: false,
+    food: true,
+    raw: false,
+    iob: false,
+    cob: false,
+    predicted: false,
+    openAps: false,
+    insulindistribution: true,
+    predictedTruncate: true
+};
+
+describe('reportstorage unit tests', () => {
+    let reportstorage, storage, mockStorage;
+
+    beforeEach(() => {
+        reportstorage = require('../lib/report/reportstorage');
+        storage = require('js-storage').localStorage;
+        mockStorage = require('./fixtures/localstorage');
+        storage.get = mockStorage.get;
+        storage.set = mockStorage.set;
+    });
+
+    afterEach(() => {
+        delete require.cache[require.resolve('js-storage')];
+        delete require.cache[require.resolve('./fixtures/localstorage')];
+        delete require.cache[require.resolve('../lib/report/reportstorage')];
+    });
+
+    it('reportstorage definition - returns saveProps and getValue function', () => {
+        reportstorage.should.not.be.undefined();
+        (reportstorage.getValue instanceof Function).should.be.true();
+        (reportstorage.saveProps instanceof Function).should.be.true();
+    });
+
+    it('reportstorage.getValue returns default properties', () => {
+        let keyCount = 0;
+        for (const v in defaultValues) {
+            reportstorage.getValue(v).should.equal(defaultValues[v]);
+            keyCount++;
+        }
+        keyCount.should.equal(Object.keys(defaultValues).length);
+    });
+
+    it('reportstorage.saveProps sets property in localstorage', () => {
+        reportstorage.saveProps({insulin: false});
+        should.exist(mockStorage.get('reportProperties'));
+        mockStorage.get('reportProperties').insulin.should.be.false();
+    });
+
+    it('reportstorage.saveProps ignores property not tracked', () => {
+        reportstorage.saveProps({foo: 'bar'});
+        should.exist(mockStorage.get('reportProperties'));
+        should.not.exist(mockStorage.get('reportProperties').foo);
+    });
+});