diff --git a/apps/remix-ide-e2e/src/commands/editorScroll.ts b/apps/remix-ide-e2e/src/commands/editorScroll.ts
new file mode 100644
index 0000000000..6d48571f68
--- /dev/null
+++ b/apps/remix-ide-e2e/src/commands/editorScroll.ts
@@ -0,0 +1,22 @@
+import { NightwatchBrowser } from "nightwatch"
+import EventEmitter from "events"
+
+// fix for editor scroll
+class ScrollEditor extends EventEmitter {
+  command (this: NightwatchBrowser, direction: 'up' | 'down', numberOfTimes: number): NightwatchBrowser {
+    const browser = this.api
+
+    browser.waitForElementPresent('.ace_text-input')
+    for (let i = 0; i < numberOfTimes; i++) {
+      if (direction.toLowerCase() === 'up') browser.sendKeys('.ace_text-input', browser.Keys.ARROW_UP)
+      if (direction.toLowerCase() === 'down') browser.sendKeys('.ace_text-input', browser.Keys.ARROW_DOWN)
+    }
+    browser.perform((done) => {
+      done()
+      this.emit('complete')
+    })
+    return this
+  }
+}
+
+module.exports = ScrollEditor
diff --git a/apps/remix-ide-e2e/src/tests/editor.test.ts b/apps/remix-ide-e2e/src/tests/editor.test.ts
new file mode 100644
index 0000000000..1154e53997
--- /dev/null
+++ b/apps/remix-ide-e2e/src/tests/editor.test.ts
@@ -0,0 +1,200 @@
+'use strict'
+
+import { NightwatchBrowser } from "nightwatch"
+
+const init = require('../helpers/init')
+const sauce = require('./sauce')
+
+module.exports = {
+
+  before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    init(browser, done)
+  },
+
+  'Should zoom in editor': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('div[data-id="mainPanelPluginsContainer"]')
+    .openFile('browser/1_Storage.sol')
+    .waitForElementVisible('*[data-id="editorInput"]')
+    .checkElementStyle('*[data-id="editorInput"]', 'font-size', '12px')
+    .click('*[data-id="tabProxyZoomIn"]')
+    .click('*[data-id="tabProxyZoomIn"]')
+    .checkElementStyle('*[data-id="editorInput"]', 'font-size', '14px')
+  },
+
+  'Should zoom out editor': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="editorInput"]')
+    .checkElementStyle('*[data-id="editorInput"]', 'font-size', '14px')
+    .click('*[data-id="tabProxyZoomOut"]')
+    .click('*[data-id="tabProxyZoomOut"]')
+    .checkElementStyle('*[data-id="editorInput"]', 'font-size', '12px')
+  },
+
+  'Should display compile error in editor': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="editorInput"]')
+    .waitForElementVisible('*[class="ace_content"]')
+    .click('*[class="ace_content"]')
+    .sendKeys('*[class="ace_text-input"]', 'error')
+    .pause(2000)
+    .waitForElementVisible('.ace_error')
+  },
+
+  'Should minimize and maximize codeblock in editor': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="editorInput"]')
+    .waitForElementVisible('.ace_open')
+    .click('.ace_start:nth-of-type(1)')
+    .waitForElementVisible('.ace_closed')
+    .click('.ace_start:nth-of-type(1)')
+    .waitForElementVisible('.ace_open')
+  },
+
+  'Should add breakpoint to editor': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="editorInput"]')
+    .waitForElementNotPresent('.ace_breakpoint')
+    .click('.ace_gutter-cell:nth-of-type(1)')
+    .waitForElementVisible('.ace_breakpoint')
+  },
+
+  'Should load syntax highlighter for ace light theme': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="editorInput"]')
+    .checkElementStyle('.ace_keyword', 'color', aceThemes.light.keyword)
+    .checkElementStyle('.ace_comment.ace_doc', 'color', aceThemes.light.comment)
+    .checkElementStyle('.ace_function', 'color', aceThemes.light.function)
+    .checkElementStyle('.ace_variable', 'color', aceThemes.light.variable)
+  },
+
+  'Should load syntax highlighter for ace dark theme': function (browser: NightwatchBrowser) {
+    browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]')
+    .click('*[data-id="verticalIconsKindsettings"]')
+    .waitForElementVisible('*[data-id="settingsTabThemeDark"]')
+    .click('*[data-id="settingsTabThemeDark"]')
+    .pause(2000)
+    .waitForElementVisible('*[data-id="editorInput"]')
+    /* @todo(#2863) ch for class and not colors
+    .checkElementStyle('.ace_keyword', 'color', aceThemes.dark.keyword)
+    .checkElementStyle('.ace_comment.ace_doc', 'color', aceThemes.dark.comment)
+    .checkElementStyle('.ace_function', 'color', aceThemes.dark.function)
+    .checkElementStyle('.ace_variable', 'color', aceThemes.dark.variable)
+    */
+  },
+
+  'Should highlight source code': function (browser: NightwatchBrowser) {
+    browser.addFile('sourcehighlight.js', sourcehighlightScript)
+    .openFile('browser/sourcehighlight.js')
+    .executeScript('remix.exeCurrent()')
+    .editorScroll('down', 60)
+    .waitForElementPresent('.highlightLine32')
+    .checkElementStyle('.highlightLine32', 'background-color', 'rgb(8, 108, 181)')
+    .waitForElementPresent('.highlightLine40')
+    .checkElementStyle('.highlightLine40', 'background-color', 'rgb(8, 108, 181)')
+    .waitForElementPresent('.highlightLine50')
+    .checkElementStyle('.highlightLine50', 'background-color', 'rgb(8, 108, 181)')
+  },
+
+  'Should remove 1 highlight from source code': function (browser: NightwatchBrowser) {
+    browser.addFile('removeSourcehighlightScript.js', removeSourcehighlightScript)
+    .openFile('browser/removeSourcehighlightScript.js')
+    .executeScript('remix.exeCurrent()')
+    .openFile('browser/3_Ballot.sol')
+    .waitForElementNotPresent('.highlightLine32')
+    .checkElementStyle('.highlightLine40', 'background-color', 'rgb(8, 108, 181)')
+    .checkElementStyle('.highlightLine50', 'background-color', 'rgb(8, 108, 181)')
+  },
+
+  'Should remove all highlights from source code': function (browser: NightwatchBrowser) {
+    browser.addFile('removeAllSourcehighlightScript.js', removeAllSourcehighlightScript)
+    .openFile('browser/removeAllSourcehighlightScript.js')
+    .executeScript('remix.exeCurrent()')
+    .openFile('browser/3_Ballot.sol')
+    .waitForElementNotPresent('.highlightLine32')
+    .waitForElementNotPresent('.highlightLine40')
+    .waitForElementNotPresent('.highlightLine50')
+    .end()
+  },
+
+  tearDown: sauce
+}
+
+const aceThemes = {
+  light: {
+    keyword: 'rgb(147, 15, 128)',
+    comment: 'rgb(35, 110, 36)',
+    function: 'rgb(0, 0, 162)',
+    variable: 'rgb(253, 151, 31)'
+  },
+  dark: {
+    keyword: 'rgb(0, 105, 143)',
+    comment: 'rgb(85, 85, 85)',
+    function: 'rgb(0, 174, 239)',
+    variable: 'rgb(153, 119, 68)'
+  }
+}
+
+const sourcehighlightScript = {
+  content: `
+  (async () => {
+    try {
+        const pos = {
+            start: {
+                line: 32,
+                column: 3
+            },
+            end: {
+                line: 32,
+                column: 20
+            }
+        }
+        await remix.call('editor', 'highlight', pos, 'browser/3_Ballot.sol')
+        
+         const pos2 = {
+            start: {
+                line: 40,
+                column: 3
+            },
+            end: {
+                line: 40,
+                column: 20
+            }
+        }
+        await remix.call('editor', 'highlight', pos2, 'browser/3_Ballot.sol')
+        
+         const pos3 = {
+            start: {
+                line: 50,
+                column: 3
+            },
+            end: {
+                line: 50,
+                column: 20
+            }
+        }
+        await remix.call('editor', 'highlight', pos3, 'browser/3_Ballot.sol')
+    } catch (e) {
+        console.log(e.message)
+    }
+  })()
+  `
+}
+
+const removeSourcehighlightScript = {
+  content: `
+  (async () => {
+    try {
+        await remix.call('editor', 'discardHighlightAt', 32, 'browser/3_Ballot.sol')         
+    } catch (e) {
+        console.log(e.message)
+    }
+  })()
+  `
+}
+
+const removeAllSourcehighlightScript = {
+  content: `
+  (async () => {
+    try {
+        await remix.call('editor', 'discardHighlight')         
+    } catch (e) {
+        console.log(e.message)
+    }
+  })()
+  `
+}
diff --git a/apps/remix-ide-e2e/src/types/index.d.ts b/apps/remix-ide-e2e/src/types/index.d.ts
index 2e5bcc16e8..653b7bb577 100644
--- a/apps/remix-ide-e2e/src/types/index.d.ts
+++ b/apps/remix-ide-e2e/src/types/index.d.ts
@@ -26,7 +26,8 @@ declare module "nightwatch" {
         journalChildIncludes(val: string): NightwatchBrowser,
         debugTransaction(index: number): NightwatchBrowser,
         checkElementStyle(cssSelector: string, styleProperty: string, expectedResult: string): NightwatchBrowser,
-        openFile(name: string): NightwatchBrowser
+        openFile(name: string): NightwatchBrowser,
+        editorScroll(direction: 'up' | 'down', numberOfTimes: number): NightwatchBrowser
     }
 
     export interface NightwatchBrowser {