While they've been announced for separate matches at WrestleMania, Rey Mysterio vs. Andrade is set for Tuesday's go-home edition of SmackDown.
The match is taking place five days before Mysterio challenges for Samoa Joe's United States Championship at WrestleMania 35. Andrade will be one of the entrants in this year's Andre the Giant Memorial Battle Royal.
WWE has set up that Mysterio's son Dominic will be in the front row for Mysterio's match at WrestleMania. Dominic has trained to be a pro wrestler with Lance Storm.
Mysterio vs. Kurt Angle has been announced for Monday's go-home episode of Raw.
A KO Show segment is also official for Tuesday's SmackDown, with AJ Styles and Randy Orton appearing on Kevin Owens' talk show. The segment will be the final build to Styles vs. Orton at WrestleMania.
Tuesday's SmackDown is taking place at the Royal Farms Arena in Baltimore, Maryland. It will also feature a contract signing for Daniel Bryan and Kofi Kingston's WWE Championship match at WrestleMania.