diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml
index 177fc261e..19cc5f037 100644
--- a/.github/workflows/chronograf-cypress-tests.yaml
+++ b/.github/workflows/chronograf-cypress-tests.yaml
@@ -71,8 +71,8 @@ jobs:
 
       - name: OAuth2 Mock Server
         run: |
-          yarn --cwd ../etc/oauth2-server-mock
-          RUNNER_TRACKING_ID="" && (nohup yarn --cwd ../etc/oauth2-server-mock start > oauth2-mock.log 2>&1 &)
+          yarn --cwd $(git rev-parse --show-toplevel)/etc/oauth2-server-mock
+          RUNNER_TRACKING_ID="" && (nohup yarn --cwd $(git rev-parse --show-toplevel)/etc/oauth2-server-mock start > oauth2-mock.log 2>&1 &)
 
       - name: Chronograf
         run: |
diff --git a/ui/package.json b/ui/package.json
index 0724f5bd5..7e19bc20f 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -16,7 +16,7 @@
     "test:watch": "jest --watch",
     "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand --watch",
     "lint": "yarn run eslint; yarn run tsc",
-    "test:e2e": "nc -z ${OAUTH2_HOSTNAME:-localhost} ${OAUTH2_PORT:-8087} && CYPRESS_oauth2ServerURL=http://${OAUTH2_HOSTNAME:-localhost}:${OAUTH2_PORT:-8087} cypress run --browser chrome --headless --reporter junit --reporter-options 'mochaFile=cypress/results/results-[hash].xml' || echo 'Unable to contact OAuth2 Server. Type \"yarn test:oauth-mock\" to start it.'",
+    "test:e2e": "nc -z ${OAUTH2_HOSTNAME:=localhost} ${OAUTH2_PORT:=8087} && CYPRESS_oauth2ServerURL=http://${OAUTH2_HOSTNAME}:${OAUTH2_PORT} cypress run --browser chrome --headless --reporter junit --reporter-options 'mochaFile=cypress/results/results-[hash].xml' || echo 'Unable to contact OAuth2 Server. Type \"yarn test:oauth-mock\" to start it.'",
     "test:e2e:headed": "nc -z ${OAUTH2_HOSTNAME:-localhost} ${OAUTH2_PORT:-8087} && CYPRESS_oauth2ServerURL=http://${OAUTH2_HOSTNAME:-localhost}:${OAUTH2_PORT:-8087} cypress open --browser chrome || echo 'Unable to contact OAuth2 Server. Type \"yarn test:oauth-mock\" to start it.'",
     "test:oauth-mock": "yarn --cwd ../etc/oauth2-server-mock start",
     "eslint": "eslint src",