In 6.x we have WatchBackwardsCompatibilityIT but master doesn't have this. It looks like a thing that we want though. I mean the big changes to watcher were in 6.0 but still, we could probably use some basic tests for it on upgrade to 7.0. Should we drag this file forward?