diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 612375ca1c..a0c100906d 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -65,3 +65,9 @@ jobs:
         working-directory: ${{ runner.temp }}/test-app
         env:
           BACKSTAGE_E2E_CLI_TEST: true
+      - name: run e2e tests in test app
+        run: yarn test:e2e:ci
+        working-directory: ${{ runner.temp }}/test-app/packages/app
+        env:
+          PORT: 3001
+          BACKSTAGE_E2E_CLI_TEST: true
diff --git a/packages/cli/templates/default-app/packages/app/cypress.json b/packages/cli/templates/default-app/packages/app/cypress.json
index 6ae01d9c2a..5de7ebffea 100644
--- a/packages/cli/templates/default-app/packages/app/cypress.json
+++ b/packages/cli/templates/default-app/packages/app/cypress.json
@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://localhost:3000",
+  "baseUrl": "http://localhost:3001",
   "fixturesFolder": false,
   "pluginsFile": false
 }
diff --git a/packages/cli/templates/default-app/packages/app/package.json.hbs b/packages/cli/templates/default-app/packages/app/package.json.hbs
index 9ac2d989a3..323c0963bd 100644
--- a/packages/cli/templates/default-app/packages/app/package.json.hbs
+++ b/packages/cli/templates/default-app/packages/app/package.json.hbs
@@ -31,8 +31,8 @@
     "bundle": "backstage-cli app:build",
     "test": "backstage-cli test",
     "lint": "backstage-cli lint",
-    "test:e2e": "start-server-and-test start http://localhost:3000 cy:dev",
-    "test:e2e:ci": "start-server-and-test start http://localhost:3000 cy:run",
+    "test:e2e": "PORT=3001 start-server-and-test start http://localhost:3001 cy:dev",
+    "test:e2e:ci": "PORT=3001 start-server-and-test start http://localhost:3001 cy:run",
     "cy:dev": "cypress open",
     "cy:run": "cypress run"
   },