diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
index 4f057786ddfe1..06a48efab9fd5 100644
--- a/coderd/workspacebuilds.go
+++ b/coderd/workspacebuilds.go
@@ -897,7 +897,8 @@ func (api *API) convertWorkspaceBuilds(
 		templateVersionByID[templateVersion.ID] = templateVersion
 	}
 
-	var apiBuilds []codersdk.WorkspaceBuild
+	// Should never be nil for API consistency
+	apiBuilds := []codersdk.WorkspaceBuild{}
 	for _, build := range workspaceBuilds {
 		job, exists := jobByID[build.JobID]
 		if !exists {
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
index 77183886ef2c2..f651a737a2924 100644
--- a/coderd/workspacebuilds_test.go
+++ b/coderd/workspacebuilds_test.go
@@ -171,6 +171,8 @@ func TestWorkspaceBuilds(t *testing.T) {
 		)
 		require.NoError(t, err)
 		require.Len(t, builds, 0)
+		// Should never be nil for API consistency
+		require.NotNil(t, builds)
 
 		builds, err = client.WorkspaceBuilds(ctx,
 			codersdk.WorkspaceBuildsRequest{WorkspaceID: workspace.ID, Since: database.Now().Add(-time.Hour)},
diff --git a/site/e2e/tests/basicFlow.spec.ts b/site/e2e/tests/basicFlow.spec.ts
index 6d506af8be236..402f89735388f 100644
--- a/site/e2e/tests/basicFlow.spec.ts
+++ b/site/e2e/tests/basicFlow.spec.ts
@@ -4,7 +4,8 @@ import { SignInPage } from "../pom"
 import { clickButton, buttons, fillInput } from "../helpers"
 
 test("Basic flow", async ({ baseURL, page }) => {
-  test.slow()
+  // We're keeping entire flows in one test, which means the test needs extra time.
+  test.setTimeout(120000)
   await page.goto(baseURL + "/", { waitUntil: "networkidle" })
 
   // Log-in with the default credentials we set up in the development server