diff --git a/app/Utils/DatabaseCleanupUtils.php b/app/Utils/DatabaseCleanupUtils.php
index 87e0c1ee37..18c050232f 100644
--- a/app/Utils/DatabaseCleanupUtils.php
+++ b/app/Utils/DatabaseCleanupUtils.php
@@ -11,7 +11,6 @@
 use App\Models\CoverageFile;
 use App\Models\Image;
 use App\Models\Note;
-use App\Models\TestOutput;
 use App\Models\UploadFile;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
@@ -161,12 +160,6 @@ public static function removeBuild($buildid): void
             $query->whereNotIn('build.id', $buildids);
         })->delete();
 
-        TestOutput::whereHas('tests.build', function (Builder $query) use ($buildids): void {
-            $query->whereIn('build.id', $buildids);
-        })->whereDoesntHave('tests.build', function (Builder $query) use ($buildids): void {
-            $query->whereNotIn('build.id', $buildids);
-        })->delete();
-
         $filesToDelete = UploadFile::whereHas('builds', function (Builder $query) use ($buildids): void {
             $query->whereIn('build.id', $buildids);
         })->whereDoesntHave('builds', function (Builder $query) use ($buildids): void {
diff --git a/database/migrations/2026_07_02_162459_build2test_testoutput_trigger.php b/database/migrations/2026_07_02_162459_build2test_testoutput_trigger.php
new file mode 100644
index 0000000000..2a635e47be
--- /dev/null
+++ b/database/migrations/2026_07_02_162459_build2test_testoutput_trigger.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        // When build2test rows are deleted, remove any testoutput rows that are
+        // no longer referenced by any remaining build2test row.  A statement-level
+        // trigger with a transition table is used so that bulk deletes are handled
+        // efficiently in a single pass.
+        DB::unprepared(<<<'SQL'
+                CREATE OR REPLACE FUNCTION delete_unreferenced_testoutput() RETURNS trigger AS $$
+                BEGIN
+                    DELETE FROM testoutput
+                    WHERE id IN (SELECT DISTINCT outputid FROM deleted_build2test)
+                    AND NOT EXISTS (
+                        SELECT 1 FROM build2test WHERE build2test.outputid = testoutput.id
+                    );
+                    RETURN NULL;
+                END;
+                $$ LANGUAGE plpgsql;
+            SQL);
+
+        DB::unprepared(<<<'SQL'
+                CREATE OR REPLACE TRIGGER build2test_delete_testoutput
+                AFTER DELETE ON build2test
+                REFERENCING OLD TABLE AS deleted_build2test
+                FOR EACH STATEMENT
+                EXECUTE FUNCTION delete_unreferenced_testoutput();
+            SQL);
+    }
+
+    public function down(): void
+    {
+    }
+};