You just need to find a good hotel. For example here's one advertising Day 1 or Day 5 tests that you can book separately. They even offer a choice of options/discounts for day 5 since you don't need the built in airport transport that day 1 comes with.
I've seen a few graphics like this floating around the Farangs Stranded Abroad group.
**********************************************************************************************