diff --git a/tezt/tests/agnostic_baker_test.ml b/tezt/tests/agnostic_baker_test.ml
index 795da17074563e9c92059e3b3411818559b341fe..6993c4b2a2f8d116c883141cbbc47770cfd353c3 100644
--- a/tezt/tests/agnostic_baker_test.ml
+++ b/tezt/tests/agnostic_baker_test.ml
@@ -216,7 +216,9 @@ let reconnect_after_migration ~migrate_from ~migrate_to =
         "reconnect";
         Protocol.tag migrate_from;
         Protocol.tag migrate_to;
-        "flaky";
+        (* TODO: https://gitlab.com/tezos/tezos/-/issues/8171
+           Reconnection during a protocol migration kills the baker. *)
+        Tag.ci_disabled;
       ]
     ~uses:[Constant.octez_agnostic_baker]
   @@ fun () ->