diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
index d939141caa..e784e3121b 100644
--- a/coderd/database/dbfake/dbfake.go
+++ b/coderd/database/dbfake/dbfake.go
@@ -372,6 +372,12 @@ func (b WorkspaceBuildBuilder) doInTX() WorkspaceResponse {
 	})
 	require.NoError(b.t, err)
 
+	// Tag the job so AcquireProvisionerJob only matches this
+	// builder's job, preventing cross-test interference when
+	// parallel tests share a database. Same pattern as
+	// dbgen.ProvisionerJob.
+	tags := database.StringMap{jobID.String(): "true", "scope": "organization"}
+
 	job, err := b.db.InsertProvisionerJob(ownerCtx, database.InsertProvisionerJobParams{
 		ID:             jobID,
 		CreatedAt:      takeFirstTime(b.jobCreatedAt, b.ws.CreatedAt, dbtime.Now()),
@@ -383,7 +389,7 @@ func (b WorkspaceBuildBuilder) doInTX() WorkspaceResponse {
 		FileID:         uuid.New(),
 		Type:           database.ProvisionerJobTypeWorkspaceBuild,
 		Input:          payload,
-		Tags:           map[string]string{},
+		Tags:           tags,
 		TraceMetadata:  pqtype.NullRawMessage{},
 		LogsOverflowed: false,
 	})
@@ -395,30 +401,24 @@ func (b WorkspaceBuildBuilder) doInTX() WorkspaceResponse {
 		// Provisioner jobs are created in 'pending' status
 		b.logger.Debug(context.Background(), "pending the provisioner job")
 	case database.ProvisionerJobStatusRunning:
-		// might need to do this multiple times if we got a template version
-		// import job as well
-		b.logger.Debug(context.Background(), "looping to acquire provisioner job")
+		b.logger.Debug(context.Background(), "acquiring the provisioner job")
 		startedAt := takeFirstTime(b.jobStartedAt, dbtime.Now())
-		for {
-			j, err := b.db.AcquireProvisionerJob(ownerCtx, database.AcquireProvisionerJobParams{
-				OrganizationID: job.OrganizationID,
-				StartedAt: sql.NullTime{
-					Time:  startedAt,
-					Valid: true,
-				},
-				WorkerID: uuid.NullUUID{
-					UUID:  uuid.New(),
-					Valid: true,
-				},
-				Types:           []database.ProvisionerType{database.ProvisionerTypeEcho},
-				ProvisionerTags: []byte(`{"scope": "organization"}`),
-			})
-			require.NoError(b.t, err, "acquire starting job")
-			if j.ID == job.ID {
-				b.logger.Debug(context.Background(), "acquired provisioner job", slog.F("job_id", job.ID))
-				break
-			}
-		}
+		j, err := b.db.AcquireProvisionerJob(ownerCtx, database.AcquireProvisionerJobParams{
+			OrganizationID: job.OrganizationID,
+			StartedAt: sql.NullTime{
+				Time:  startedAt,
+				Valid: true,
+			},
+			WorkerID: uuid.NullUUID{
+				UUID:  uuid.New(),
+				Valid: true,
+			},
+			Types:           []database.ProvisionerType{database.ProvisionerTypeEcho},
+			ProvisionerTags: must(json.Marshal(tags)),
+		})
+		require.NoError(b.t, err, "acquire the provisioner job")
+		require.Equal(b.t, job.ID, j.ID, "acquired wrong provisioner job")
+		b.logger.Debug(context.Background(), "acquired provisioner job", slog.F("job_id", job.ID))
 		if !b.jobUpdatedAt.IsZero() {
 			err = b.db.UpdateProvisionerJobByID(ownerCtx, database.UpdateProvisionerJobByIDParams{
 				ID:        job.ID,