diff --git a/test/realtime/cleanDanglingUser.test.js b/test/realtime/cleanDanglingUser.test.js
index 19df1626..dc53627b 100644
--- a/test/realtime/cleanDanglingUser.test.js
+++ b/test/realtime/cleanDanglingUser.test.js
@@ -4,26 +4,24 @@
 const assert = require('assert')
 const mock = require('mock-require')
 const sinon = require('sinon')
+const { createFakeLogger } = require('../testDoubles/loggerFake')
 const { removeModuleFromRequireCache, makeMockSocket } = require('./utils')
 
 describe('cleanDanglingUser', function () {
   let clock
   beforeEach(() => {
     clock = sinon.useFakeTimers()
+    mock('../../dist/models', {})
     mock('../../dist/processQueue', require('../testDoubles/ProcessQueueFake'))
-    mock('../../dist/logger', {
-      error: () => {},
-      info: () => {}
-    })
+    mock('../../dist/logger', createFakeLogger())
     mock('../../dist/history', {})
-    mock('../../dist/models', {
-      Revision: {
-        saveAllNotesRevision: () => {
-        }
+    mock('../../dist/services/note', {
+      saveAllNotesRevision: () => {
       }
     })
     mock('../../dist/config', {
-      debug: true
+      debug: true,
+      db: {}
     })
     mock('../../dist/realtimeUpdateDirtyNoteJob', require('../testDoubles/realtimeJobStub'))
     mock('../../dist/realtimeSaveRevisionJob', require('../testDoubles/realtimeJobStub'))
diff --git a/test/realtime/dirtyNoteUpdate.test.js b/test/realtime/dirtyNoteUpdate.test.js
index 31ce7d10..08d73c4f 100644
--- a/test/realtime/dirtyNoteUpdate.test.js
+++ b/test/realtime/dirtyNoteUpdate.test.js
@@ -4,6 +4,7 @@
 const assert = require('assert')
 const mock = require('mock-require')
 const sinon = require('sinon')
+const { createFakeLogger } = require('../testDoubles/loggerFake')
 const { removeModuleFromRequireCache, makeMockSocket, removeLibModuleCache } = require('./utils')
 
 describe('realtime#update note is dirty timer', function () {
@@ -15,16 +16,11 @@ describe('realtime#update note is dirty timer', function () {
     clock = sinon.useFakeTimers({
       toFake: ['setInterval']
     })
-    mock('../../dist/logger', {
-      error: () => {
-      }
-    })
+    mock('../../dist/logger', createFakeLogger())
     mock('../../dist/history', {})
-    mock('../../dist/models', {
-      Revision: {
-        saveAllNotesRevision: () => {
-        }
-      }
+    mock('../../dist/models', {})
+    mock('../../dist/services/note', {
+      saveAllNotesRevision: () => {}
     })
     mock('../../dist/config', {})
     realtime = require('../../dist/realtime/realtime')
diff --git a/test/realtime/disconnect-process.test.js b/test/realtime/disconnect-process.test.js
index 81e320dd..1d88cfe9 100644
--- a/test/realtime/disconnect-process.test.js
+++ b/test/realtime/disconnect-process.test.js
@@ -19,11 +19,10 @@ describe('realtime#disconnect', function () {
       error: () => {
       }
     })
+    mock('../../dist/models', {})
     mock('../../dist/history', {})
-    mock('../../dist/models', {
-      Revision: {
-        saveAllNotesRevision: () => {
-        }
+    mock('../../dist/services/note', {
+      saveAllNotesRevision: () => {
       }
     })
     mock('../../dist/config', {})
diff --git a/test/realtime/saveRevisionJob.test.js b/test/realtime/saveRevisionJob.test.js
index 6e712eeb..2345ba6b 100644
--- a/test/realtime/saveRevisionJob.test.js
+++ b/test/realtime/saveRevisionJob.test.js
@@ -8,23 +8,22 @@ const { removeModuleFromRequireCache, removeLibModuleCache } = require('./utils'
 
 describe('save revision job', function () {
   let clock
-  let mockModels
+  let noteService
   let realtime
   beforeEach(() => {
     removeLibModuleCache()
-    mockModels = {
-      Revision: {
-        saveAllNotesRevision: sinon.stub()
-      }
-    }
     clock = sinon.useFakeTimers()
+    noteService = {
+      saveAllNotesRevision: sinon.stub()
+    }
     mock('../../dist/processQueue', require('../testDoubles/ProcessQueueFake'))
     mock('../../dist/logger', {
       error: () => {},
       info: () => {}
     })
     mock('../../dist/history', {})
-    mock('../../dist/models', mockModels)
+    mock('../../dist/models', {  })
+    mock('../../dist/services/note', noteService)
     mock('../../dist/config', {
       debug: true
     })
@@ -41,28 +40,28 @@ describe('save revision job', function () {
   })
 
   it('should execute save revision job every 5 min', (done) => {
-    mockModels.Revision.saveAllNotesRevision.callsFake((callback) => {
+    noteService.saveAllNotesRevision.callsFake((callback) => {
       callback(null, [])
     })
     realtime = require('../../dist/realtime/realtime')
     clock.tick(5 * 60 * 1000)
     clock.restore()
     setTimeout(() => {
-      assert(mockModels.Revision.saveAllNotesRevision.called)
+      assert(noteService.saveAllNotesRevision.called)
       assert(realtime.saveRevisionJob.getSaverSleep() === true)
       done()
     }, 50)
   })
 
   it('should not set saverSleep when more than 1 note save revision', (done) => {
-    mockModels.Revision.saveAllNotesRevision.callsFake((callback) => {
+    noteService.saveAllNotesRevision.callsFake((callback) => {
       callback(null, [1])
     })
     realtime = require('../../dist/realtime/realtime')
     clock.tick(5 * 60 * 1000)
     clock.restore()
     setTimeout(() => {
-      assert(mockModels.Revision.saveAllNotesRevision.called)
+      assert(noteService.saveAllNotesRevision.called)
       assert(realtime.saveRevisionJob.getSaverSleep() === false)
       done()
     }, 50)
diff --git a/test/realtime/socket-events.test.js b/test/realtime/socket-events.test.js
index b4743a91..60d4f5bd 100644
--- a/test/realtime/socket-events.test.js
+++ b/test/realtime/socket-events.test.js
@@ -4,6 +4,7 @@
 const assert = require('assert')
 const mock = require('mock-require')
 const sinon = require('sinon')
+const { createFakeLogger } = require('../testDoubles/loggerFake')
 
 const { makeMockSocket, removeModuleFromRequireCache } = require('./utils')
 
@@ -64,16 +65,15 @@ describe('realtime#socket event', function () {
         locked: 'locked',
         protected: 'protected',
         private: 'private'
-      }
-    }
-    mock('../../dist/logger', {
-      error: () => {
       },
-      info: () => {
-      }
-    })
+      db: {}
+    }
+    mock('../../dist/logger', createFakeLogger())
     mock('../../dist/history', {})
     mock('../../dist/models', modelsMock)
+    mock('../../dist/services/note', {
+      saveAllNotesRevision: () => {}
+    })
     mock('../../dist/config', configMock)
     mock('ot', require('../testDoubles/otFake'))
     realtime = require('../../dist/realtime/realtime')
diff --git a/test/testDoubles/loggerFake.js b/test/testDoubles/loggerFake.js
index c4ce9cd4..015e59d4 100644
--- a/test/testDoubles/loggerFake.js
+++ b/test/testDoubles/loggerFake.js
@@ -8,7 +8,14 @@ function createFakeLogger () {
     warn: sinon.stub(),
     info: sinon.stub(),
     debug: sinon.stub(),
-    log: sinon.stub()
+    log: sinon.stub(),
+    logger: {
+      error: sinon.stub(),
+      warn: sinon.stub(),
+      info: sinon.stub(),
+      debug: sinon.stub(),
+      log: sinon.stub()
+    }
   }
 }
 
diff --git a/test/testDoubles/otFake.js b/test/testDoubles/otFake.js
index 9fd5d3fd..fa2e4ed7 100644
--- a/test/testDoubles/otFake.js
+++ b/test/testDoubles/otFake.js
@@ -12,6 +12,8 @@ class EditorSocketIOServerFake {
     this.setColor = sinon.stub()
     this.getClient = sinon.stub()
     this.onDisconnect = sinon.stub()
+    this.setLogger = sinon.stub()
+    this.setDocumentMaxLength = sinon.stub()
   }
 }