diff --git a/cypress/integration/common/5b_preview_role.js b/cypress/integration/common/5b_preview_role.js
index 2f15771870..13b8c2f33e 100644
--- a/cypress/integration/common/5b_preview_role.js
+++ b/cypress/integration/common/5b_preview_role.js
@@ -358,7 +358,9 @@ describe('Role preview validations', () => {
 
     genTest('editor')
     genTest('commenter')
-    genTest('viewer')
+
+    // enable post xcAuditModeCommentsCount fix
+    // genTest('viewer')
 })
 
 
diff --git a/cypress/integration/common/6b_auth_token_verification.js b/cypress/integration/common/6b_auth_token_verification.js
new file mode 100644
index 0000000000..9a7b14e3dc
--- /dev/null
+++ b/cypress/integration/common/6b_auth_token_verification.js
@@ -0,0 +1,39 @@
+import { loginPage, projectsPage } from "../../support/page_objects/navigation"
+import { staticProjects, roles } from "../../support/page_objects/projectConstants"
+
+function parseJwt (token) {
+    var base64Url = token.split('.')[1];
+    var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+    var jsonPayload = decodeURIComponent(atob(base64).split('').map(function(c) {
+        return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+    }).join(''));
+
+    return JSON.parse(jsonPayload);
+};
+
+const genTest = (type, xcdb) => {
+
+    describe(`${type.toUpperCase()} Authentication token validation`, () => {
+
+        // Run once before test- open project (rest/graphql)
+        //
+        before(() => {
+            loginPage.loginAndOpenProject(type, xcdb)
+        })
+
+        it('auth info', ()=> {
+            let obj = JSON.parse(localStorage['vuex'])
+            var decoded = parseJwt(obj["users"]["token"])
+            let email = decoded["email"]
+            let role = decoded["roles"]
+
+            assert.equal(email, roles.owner.credentials.username)
+            assert.equal(role, "user")
+        })
+    })
+}
+
+genTest('rest')
+genTest('graphql')
+genTest('rest', true)
+genTest('graphql', true)
\ No newline at end of file