Whitney Houston, Lea Michele

Glee is filming a Whitney Houston-themed tribute episode, TVGuide.com has confirmed.

The upcoming episode will feature eight songs by the late Houston, according to E! Online, which first reported the news. It also won't be a straight-up tribute like past Madonna and Michael Jackson-themed episodes. Instead, the songs will represent the hard time Glee's graduating seniors are having with moving on.

Whitney Houston's family: It was Apparent that drugs would kill her

Star Lea Michele first got everyone buzzing about "special" episode. "Filming something right now that's going to be really special," she hinted on Twitter. "Can't wait for you all to see it."

Last month, Amber Riley performed Houston's hit "I Will Always Love You," which was planned prior to the singer's death.

Glee returns with new episodes Tuesday, April 10, at 8/7c on Fox.