Former Strikeforce lightweight champion Josh Thomson will take on a rejuvenated Michael Johnson at UFC on Fox 12 on July 26.
The 155-pound scrap will take place at the SAP Center in San Jose, California, and Fox Sports was the first media outlet to report the matchup.
Thomson, who is 2-3 in his last five bouts, is the No. 3 lightweight in the UFC's official rankings after scoring convincing wins over KJ Noons and Nate Diaz and losing decisions to Tatsuya Kawajiri, Gilbert Melendez and Benson Henderson.
However, the split-decision losses to Melendez and Henderson were heavily debated among fans and analysts alike. Some thought the judges' scores could have gone the other way.
"The Punk" recently made headlines after sending out a profanity-laced tweet, calling out welterweight Nick Diaz, though he stated that his phone had been stolen and he didn't actually send the tweet shortly afterward.
Johnson, a runner-up on Season 12 of The Ultimate Fighter, has shown vast improvements in his game after joining the Boca Raton, Florida-based Blackzilians camp.
"The Menace" is riding a three-fight win streak over respected names in Joe Lauzon, Gleison Tibau and Melvin Guillard.
Earlier in the week, Johnson invited Thomson to square off with him at UFC on Fox 12, referencing his recent drama with the Diaz brothers:
While Thomson did not respond, obviously the UFC brass took notice.
The UFC ranks Johnson as the No. 10 lightweight, although a win here would likely have him knocking on the door of a title shot.
No main event has been announced for the summer event yet, and the only other bout officially on tap for the card is a light heavyweight matchup between Anthony Johnson and Antonio Rogerio Nogueira.