I have the exact situation and was getting ready to post the same question, hope someone knows. I've heard that Phuket might test at the airport but who knows...
The ask:thailand community, consisting of multiple Q/A groups with over 100,000 members, powers this platform. It is not an official government resource. Our members actively contribute to this resource, and while we strive for accuracy, we cannot guarantee its complete reliability. Assistance to travelers is provided as a community service.