diff --git a/frontend/cypress/tests/codeView/codeView_codeHighlighting.cy.js b/frontend/cypress/tests/codeView/codeView_codeHighlighting.cy.js
new file mode 100644
index 0000000000..adbd9c338c
--- /dev/null
+++ b/frontend/cypress/tests/codeView/codeView_codeHighlighting.cy.js
@@ -0,0 +1,67 @@
+// Assumes: RepoSense repo from 03/05/2018 to current date
+describe('code highlighting works properly', () => {
+  it('should highlight code when there is a single author', () => {
+    // open the code panel
+    cy.get('.icon-button.fa-code')
+      .should('exist')
+      .first()
+      .click();
+
+    cy.get('#tab-authorship .files', { timeout: 90000 })
+      .should('be.visible');
+
+    cy.get('.hljs-comment').contains('* Represents a Git Author.')
+      .parent() // .line-content
+      .parent() // .code
+      .should('have.css', 'background-color', 'rgb(230, 255, 237)'); // #e6ffed
+  });
+
+  it('should highlight code when multiple authors are merged in a repo group', () => {
+    cy.get('div.mui-select.grouping > select:visible')
+      .select('groupByRepos');
+
+    cy.get('#summary label.merge-group > input:visible')
+      .should('be.visible')
+      .check()
+      .should('be.checked');
+
+    // open the code panel
+    cy.get('.icon-button.fa-code')
+      .should('exist')
+      .first()
+      .click();
+
+    cy.get('#tab-authorship .files', { timeout: 90000 })
+      .should('be.visible');
+
+    cy.get('.hljs-comment').contains('* MUI Colors module') // eugenepeh
+      .parent() // .line-content
+      .parent() // .code
+      .should('have.css', 'background-color', 'rgba(30, 144, 255, 0.19)') // #1e90ff, transparencyValue 30
+      .then((firstAuthorColor) => {
+        // eslint-disable-next-line quotes
+        cy.get('.line-content').contains("'red': (") // jamessspanggg
+          .parent() // .code
+          // #f08080, transparencyValue 30
+          .should('have.css', 'background-color', 'rgba(240, 128, 128, 0.19)')
+          .and('not.eq', firstAuthorColor);
+      });
+  });
+
+  it('should not highlight non-attributed lines', () => {
+    // open the code panel
+    cy.get('.icon-button.fa-code')
+      .should('exist')
+      .first()
+      .click();
+
+    cy.get('#tab-authorship .files', { timeout: 90000 })
+      .should('be.visible');
+
+    cy.get('.hljs-title').contains('Author')
+      .parent() // .hljs-class
+      .parent() // .line-content
+      .parent() // .code
+      .should('have.css', 'background-color', 'rgb(255, 255, 255)'); // #ffffff
+  });
+});