Will I qualify for 72-hour visa-free entry on both following occasions?

I am a Canadian citizen travelling from Tokyo, Japan to Beijing, staying in Beijing hotel for two nights, then flying to Pyongyang, North Korea.
Then 5 days later, I will fly from Pyongyang, North Korea to Beijing, stay in Beijing hotel for two nights, then fly back to Tokyo Japan.