diff --git a/src/components/settings/Settings.test.tsx b/src/components/settings/Settings.test.tsx
index 75177e3..6a8ead7 100644
--- a/src/components/settings/Settings.test.tsx
+++ b/src/components/settings/Settings.test.tsx
@@ -8,7 +8,8 @@ it('renders settings popup with both save buttons', async () => {
     await waitFor(() => screen.findByText(/github token/i))
 
     // GitHub and KittyCAD buttons
-    const buttons = screen.getAllByRole('button')
+    // TODO: understand why screen.getByRole started to hang
+    const buttons = screen.getAllByText('Save')
     expect(buttons[0]).toBeEnabled()
     expect(buttons[1]).toBeEnabled()
 })
diff --git a/src/components/settings/TokenForm.test.tsx b/src/components/settings/TokenForm.test.tsx
index cbad17a..e51fd18 100644
--- a/src/components/settings/TokenForm.test.tsx
+++ b/src/components/settings/TokenForm.test.tsx
@@ -9,10 +9,12 @@ it('renders a token form and checks its callback', () => {
     render(<TokenForm service={service} onToken={callback} />)
     expect(screen.getByText(`Enter a ${service} token`)).toBeInTheDocument()
 
-    const field = screen.getByRole('textbox')
+    // TODO: understand why screen.getByRole started to hang
+    const field = screen.getByAltText("Text input for token")
     fireEvent.change(field, { target: { value: token } })
 
-    const button = screen.getByRole('button')
+    // TODO: understand why screen.getByRole started to hang
+    const button = screen.getByText('Save')
     expect(button).toBeEnabled()
     fireEvent.click(button)
 
diff --git a/src/components/settings/TokenForm.tsx b/src/components/settings/TokenForm.tsx
index 9310219..df36107 100644
--- a/src/components/settings/TokenForm.tsx
+++ b/src/components/settings/TokenForm.tsx
@@ -14,6 +14,7 @@ export function TokenForm({ service, onToken }: TokenFormProps) {
             <FormControl required>
                 <FormControl.Label>Enter a {service} token</FormControl.Label>
                 <TextInput
+                    alt="Text input for token"
                     value={token}
                     onChange={e => setToken(e.target.value)}
                 />