diff --git a/packages/builder/cypress/integration/createUserAndRoles.spec.js b/packages/builder/cypress/integration/createUserAndRoles.spec.js
index 7cb3bda93b..9c12971bd8 100644
--- a/packages/builder/cypress/integration/createUserAndRoles.spec.js
+++ b/packages/builder/cypress/integration/createUserAndRoles.spec.js
@@ -26,102 +26,104 @@ filterTests(["smoke", "all"], () => {
       cy.get(".spectrum-Table").eq(0).contains("No rows found")
     })
 
-    it("should assign role types", () => {
-      // 3 apps minimum required - to assign an app to each role type
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-        .its("body")
-        .then(val => {
-          if (val.length < 3) {
-            for (let i = 1; i < 3; i++) {
-              const uuid = () => Cypress._.random(0, 1e6)
-              const name = uuid()
-              if(i < 1){
-                cy.createApp(name)
-              } else {
-                cy.visit(`${Cypress.config().baseUrl}/builder`)
-                cy.wait(500)
-                cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
-                cy.createAppFromScratch(name)
+    if (Cypress.env("TEST_ENV")) {
+      it("should assign role types", () => {
+        // 3 apps minimum required - to assign an app to each role type
+        cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+          .its("body")
+          .then(val => {
+            if (val.length < 3) {
+              for (let i = 1; i < 3; i++) {
+                const uuid = () => Cypress._.random(0, 1e6)
+                const name = uuid()
+                if(i < 1){
+                  cy.createApp(name)
+                } else {
+                  cy.visit(`${Cypress.config().baseUrl}/builder`)
+                  cy.wait(500)
+                  cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
+                  cy.createAppFromScratch(name)
+                }
               }
             }
-          }
-        })
-      // Navigate back to the user
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
-      cy.get(".spectrum-SideNav").contains("Users").click()
-      cy.wait(500)
-      cy.get(".spectrum-Table").contains("bbuser").click()
-      cy.wait(1000)
-      for (let i = 0; i < 3; i++) {
-        cy.get(".spectrum-Table")
-          .eq(1)
-          .find(".spectrum-Table-row")
-          .eq(0)
-          .find(".spectrum-Table-cell")
-          .eq(0)
-          .click()
-        cy.wait(500)
-        cy.get(".spectrum-Dialog-grid")
-          .contains("Choose an option")
-          .click()
-          .then(() => {
-            cy.wait(1000)
-            if (i == 0) {
-              cy.get(".spectrum-Popover").contains("Admin").click()
-            }
-            if (i == 1) {
-              cy.get(".spectrum-Popover").contains("Power").click()
-            }
-            if (i == 2) {
-              cy.get(".spectrum-Popover").contains("Basic").click()
-            }
-            cy.wait(1000)
-            cy.get(".spectrum-Button")
-              .contains("Update role")
-              .click({ force: true })
           })
-      }
-      // Confirm roles exist within Configure roles table
-      cy.wait(2000)
-      cy.get(".spectrum-Table")
-        .eq(0)
-        .within(assginedRoles => {
-          expect(assginedRoles).to.contain("Admin")
-          expect(assginedRoles).to.contain("Power")
-          expect(assginedRoles).to.contain("Basic")
-        })
-    })
-
-    it("should unassign role types", () => {
-      // Set each app within Configure roles table to 'No Access'
-      cy.get(".spectrum-Table")
-        .eq(0)
-        .find(".spectrum-Table-row")
-        .its("length")
-        .then(len => {
-          for (let i = 0; i < len; i++) {
-            cy.get(".spectrum-Table")
-              .eq(0)
-              .find(".spectrum-Table-row")
-              .eq(0)
-              .find(".spectrum-Table-cell")
-              .eq(0)
-              .click()
-              .then(() => {
-                cy.get(".spectrum-Picker").eq(1).click({ force: true })
-                cy.wait(500)
-                cy.get(".spectrum-Popover").contains("No Access").click()
-              })
-            cy.get(".spectrum-Button")
-              .contains("Update role")
-              .click({ force: true })
-            cy.wait(1000)
-          }
-        })
-      // Confirm Configure roles table no longer has any apps in it
-      cy.get(".spectrum-Table").eq(0).contains("No rows found")
-    })
+        // Navigate back to the user
+        cy.visit(`${Cypress.config().baseUrl}/builder`)
+        cy.wait(500)
+        cy.get(".spectrum-SideNav").contains("Users").click()
+        cy.wait(500)
+        cy.get(".spectrum-Table").contains("bbuser").click()
+        cy.wait(1000)
+        for (let i = 0; i < 3; i++) {
+          cy.get(".spectrum-Table")
+            .eq(1)
+            .find(".spectrum-Table-row")
+            .eq(0)
+            .find(".spectrum-Table-cell")
+            .eq(0)
+            .click()
+          cy.wait(500)
+          cy.get(".spectrum-Dialog-grid")
+            .contains("Choose an option")
+            .click()
+            .then(() => {
+              cy.wait(1000)
+              if (i == 0) {
+                cy.get(".spectrum-Popover").contains("Admin").click()
+              }
+              if (i == 1) {
+                cy.get(".spectrum-Popover").contains("Power").click()
+              }
+              if (i == 2) {
+                cy.get(".spectrum-Popover").contains("Basic").click()
+              }
+              cy.wait(1000)
+              cy.get(".spectrum-Button")
+                .contains("Update role")
+                .click({ force: true })
+            })
+        }
+        // Confirm roles exist within Configure roles table
+        cy.wait(2000)
+        cy.get(".spectrum-Table")
+          .eq(0)
+          .within(assginedRoles => {
+            expect(assginedRoles).to.contain("Admin")
+            expect(assginedRoles).to.contain("Power")
+            expect(assginedRoles).to.contain("Basic")
+          })
+      })
+  
+      it("should unassign role types", () => {
+        // Set each app within Configure roles table to 'No Access'
+        cy.get(".spectrum-Table")
+          .eq(0)
+          .find(".spectrum-Table-row")
+          .its("length")
+          .then(len => {
+            for (let i = 0; i < len; i++) {
+              cy.get(".spectrum-Table")
+                .eq(0)
+                .find(".spectrum-Table-row")
+                .eq(0)
+                .find(".spectrum-Table-cell")
+                .eq(0)
+                .click()
+                .then(() => {
+                  cy.get(".spectrum-Picker").eq(1).click({ force: true })
+                  cy.wait(500)
+                  cy.get(".spectrum-Popover").contains("No Access").click()
+                })
+              cy.get(".spectrum-Button")
+                .contains("Update role")
+                .click({ force: true })
+              cy.wait(1000)
+            }
+          })
+        // Confirm Configure roles table no longer has any apps in it
+        cy.get(".spectrum-Table").eq(0).contains("No rows found")
+      })
+    }
 
     it("should enable Developer access", () => {
       // Enable Developer access