Apply for a tourist visa in advance, the old visa waiver system doesn't work the same way anymore. I think you can do it a few weeks before but I'd check just to make sure.