24h Visa Free Transit

I am travelling from the UK to Japan with a 3h layover in Shanghai and returning with a layover in Beijing of 4h the week after. I will only stay in the airports in China.

My passport, which is Swedish, will only be valid for another 5 months when landing in China. Is there a possibility that the validity length can be an issue? I have been informed that the passport needs to be valid for 6 months when entering China, however, I am wondering if this is the same case for 24h Visa Free travellers?