Haas posted a victory in his native Germany at the BMW Open and moves up one spot to No. 13 in the rankings while Wawrinka is up to 15th -- also an improvement of one place -- after his win Sunday at the Portugal Open.
Both return to action this week for the Mutua Madrid Open, the first of back-to-back Masters 1,000 events on the ATP calendar. The tour has the BNL International in Rome next week.
The only player in the Top 20 of the rankings missing from Madrid is No. 7-ranked Juan Martin del Potro, who has been sidelined with a viral infection. The same illness kept del Potro from trying to defend his Portugal Open title. He was a semifinalist in Madrid last year.
World No. 1 Novak Djokovic and fourth-ranked David Ferrer lost in last year's Madrid quarterfinals while No. 5 Rafael Nadal dropped a third-round match. Andy Murray, third in the rankings, didn't play in Madrid last year.
Djokovic has 12,900 rankings points and has tied Lleyton Hewitt for ninth-most all-time with 80 weeks atop the rankings. Andre Agassi, with 101 weeks, is eighth on the list and Nadal, No. 1 for 102 weeks, is seventh.
Federer's 8,670-point total is second but if Murray, who has 8,570 points, reaches the Madrid quarterfinals, he'll move back to No. 2. Ferrer has 6,920 points for fourth and Nadal is fifth with 5,985.
Berdych, protecting 600 points as a 2012 finalist, has 4,760 points for sixth and del Porto (4,680) will see his total slip and may lose his No. 7 ranking. Jo-Wilfried Tsonga is eighth with 3,875 points followed by No. 9 Richard Gasquet (3,260) and Tipsarevic (3,000).