Starbucks has begun to switch over stores in the San Antonio area from T-Mobile’s Wi-Fi service to AT&T, the companies confirmed today. So far, only one store is successfully up and running using AT&T’s network. Before the end of the year, Starbucks and AT&T plan to switch over as many as 7,000 locations.

Based in San Antonio, AT&T already has about 10,000 public hotspots across the country; the addition of Starbucks locations will increase its total to about 17,000.

In February, Starbucks announced plans to switch from long-time provider T-Mobile to AT&T for Wi-Fi service; T-Mobile customers will still be able to access Wi-Fi at Starbucks locations thanks to a roaming agreement between the two carriers.

Wi-Fi service in Starbucks will be free to qualifying customers of AT&T’s U-verse and broadband services in the company’s 22-state operating region. Starbucks cardholders also will qualify for free access; paid service will start at $3.99 per session. Starbucks also has announced that it will offer its employees free access at any location.