diff --git a/apps/studio/components/interfaces/Account/NewAccessTokenButton.tsx b/apps/studio/components/interfaces/Account/NewAccessTokenButton.tsx
index 92bc2ea585c..869df587ae5 100644
--- a/apps/studio/components/interfaces/Account/NewAccessTokenButton.tsx
+++ b/apps/studio/components/interfaces/Account/NewAccessTokenButton.tsx
@@ -83,6 +83,7 @@ const NewAccessTokenButton = ({ onCreateToken }: NewAccessTokenButtonProps) => {
             <DropdownMenuTrigger asChild>
               <Button
                 type="primary"
+                title="Choose token scope"
                 className="rounded-l-none px-[4px] py-[5px]"
                 icon={<ChevronDown />}
               />
@@ -147,9 +148,13 @@ const NewAccessTokenButton = ({ onCreateToken }: NewAccessTokenButtonProps) => {
                 name="tokenName"
                 control={form.control}
                 render={({ field }) => (
-                  <FormItemLayout label="Name">
+                  <FormItemLayout name="tokenName" label="Name">
                     <FormControl_Shadcn_>
-                      <Input_Shadcn_ {...field} placeholder="Provide a name for your token" />
+                      <Input_Shadcn_
+                        id="tokenName"
+                        {...field}
+                        placeholder="Provide a name for your token"
+                      />
                     </FormControl_Shadcn_>
                   </FormItemLayout>
                 )}
diff --git a/apps/studio/components/interfaces/Account/__tests__/NewAccessTokenButton.test.tsx b/apps/studio/components/interfaces/Account/__tests__/NewAccessTokenButton.test.tsx
new file mode 100644
index 00000000000..92cd8d50e3e
--- /dev/null
+++ b/apps/studio/components/interfaces/Account/__tests__/NewAccessTokenButton.test.tsx
@@ -0,0 +1,16 @@
+import { describe, expect, it, vi } from 'vitest'
+import { screen } from '@testing-library/dom'
+import userEvent from '@testing-library/user-event'
+import { render } from 'tests/helpers'
+import NewAccessTokenButton from '../NewAccessTokenButton'
+
+describe(`NewAccessTokenButton`, () => {
+  it(`works`, async () => {
+    const onCreateToken = vi.fn()
+    render(<NewAccessTokenButton onCreateToken={onCreateToken} />)
+    await userEvent.click(screen.getByRole(`button`, { name: `Generate new token` }))
+    await screen.findByLabelText(`Name`)
+
+    expect(screen.getByRole('heading')).toHaveTextContent('Generate New Token')
+  })
+})
diff --git a/apps/studio/vitest.config.ts b/apps/studio/vitest.config.ts
index f2a848d5581..5bc87dabad6 100644
--- a/apps/studio/vitest.config.ts
+++ b/apps/studio/vitest.config.ts
@@ -25,7 +25,6 @@ export default defineConfig({
     globals: true,
     environment: 'jsdom', // TODO(kamil): This should be set per test via header in .tsx files only
     include: [resolve(dirname, './**/*.test.{ts,tsx}')],
-    restoreMocks: true,
     setupFiles: [
       resolve(dirname, './tests/vitestSetup.ts'),
       resolve(dirname, './tests/setup/polyfills.js'),