diff --git a/src/build/functions/edge.ts b/src/build/functions/edge.ts
index f68be7ca95..1cf4554a0f 100644
--- a/src/build/functions/edge.ts
+++ b/src/build/functions/edge.ts
@@ -132,9 +132,11 @@ const copyHandlerDependencies = async (
 
   const outputFile = join(destDir, `server/${name}.js`)
 
-  // Prepare environment variables for draft-mode (i.e. __NEXT_PREVIEW_MODE_ID, __NEXT_PREVIEW_MODE_SIGNING_KEY, __NEXT_PREVIEW_MODE_ENCRYPTION_KEY)
-  for (const [key, value] of Object.entries(env)) {
-    parts.push(`process.env.${key} = '${value}';`)
+  if (env) {
+    // Prepare environment variables for draft-mode (i.e. __NEXT_PREVIEW_MODE_ID, __NEXT_PREVIEW_MODE_SIGNING_KEY, __NEXT_PREVIEW_MODE_ENCRYPTION_KEY)
+    for (const [key, value] of Object.entries(env)) {
+      parts.push(`process.env.${key} = '${value}';`)
+    }
   }
 
   if (wasm?.length) {
diff --git a/tests/netlify-deploy.ts b/tests/netlify-deploy.ts
index f1c979375c..bddec44fd1 100644
--- a/tests/netlify-deploy.ts
+++ b/tests/netlify-deploy.ts
@@ -148,7 +148,7 @@ export class NextDeployInstance extends NextInstance {
 
     try {
       const deployUrlRegex = new RegExp(
-        /https:\/\/app\.netlify\.com\/sites\/(?<siteName>[^\/]+)\/deploys\/(?<deployID>[0-9a-f]+)/gm,
+        /https:\/\/app\.netlify\.com\/(sites|projects)\/(?<siteName>[^\/]+)\/deploys\/(?<deployID>[0-9a-f]+)/gm,
       ).exec(deployRes.stdout)
       const [buildLogsUrl] = deployUrlRegex || []
       const { deployID, siteName } = deployUrlRegex?.groups || {}
diff --git a/tests/utils/create-e2e-fixture.ts b/tests/utils/create-e2e-fixture.ts
index 9ec2bfd92c..5d17341700 100644
--- a/tests/utils/create-e2e-fixture.ts
+++ b/tests/utils/create-e2e-fixture.ts
@@ -281,7 +281,7 @@ async function deploySite(
 
   const { siteName, deployID } =
     new RegExp(
-      /app\.netlify\.com\/sites\/(?<siteName>[^\/]+)\/deploys\/(?<deployID>[0-9a-f]+)/gm,
+      /app\.netlify\.com\/(sites|projects)\/(?<siteName>[^\/]+)\/deploys\/(?<deployID>[0-9a-f]+)/gm,
     ).exec(output)?.groups || {}
 
   if (!deployID) {