diff --git a/src/tags/helpers/Tag.tsx b/src/tags/helpers/Tag.tsx
index 2e116a80..61ab3057 100644
--- a/src/tags/helpers/Tag.tsx
+++ b/src/tags/helpers/Tag.tsx
@@ -19,6 +19,8 @@ export const Tag: FC<TagProps> = ({ text, children, clearable, className = '', c
     onClick={onClick}
   >
     {children ?? text}
-    {clearable && <span aria-label="Close" className="close tag__close-selected-tag" onClick={onClose}>&times;</span>}
+    {clearable && (
+      <span aria-label={`Remove ${text}`} className="close tag__close-selected-tag" onClick={onClose}>&times;</span>
+    )}
   </span>
 );
diff --git a/test/tags/TagCard.test.tsx b/test/tags/TagCard.test.tsx
index d0e9297c..18dcb66c 100644
--- a/test/tags/TagCard.test.tsx
+++ b/test/tags/TagCard.test.tsx
@@ -2,15 +2,15 @@ import { screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { Mock } from 'ts-mockery';
 import { TagCard as createTagCard } from '../../src/tags/TagCard';
-import { ColorGenerator } from '../../src/utils/services/ColorGenerator';
 import { ReachableServer } from '../../src/servers/data';
 import { renderWithEvents } from '../__helpers__/setUpTest';
+import { colorGeneratorMock } from '../utils/services/__mocks__/ColorGenerator.mock';
 
 describe('<TagCard />', () => {
   const TagCard = createTagCard(
     ({ isOpen }) => <span>DeleteTagConfirmModal {isOpen ? '[Open]' : '[Closed]'}</span>,
     ({ isOpen }) => <span>EditTagModal {isOpen ? '[Open]' : '[Closed]'}</span>,
-    Mock.of<ColorGenerator>({ getColorForKey: () => '' }),
+    colorGeneratorMock,
   );
   const setUp = (tag = 'ssr') => renderWithEvents(
     <MemoryRouter>
diff --git a/test/tags/helpers/TagsSelector.test.tsx b/test/tags/helpers/TagsSelector.test.tsx
index 143e32da..e6bed7ec 100644
--- a/test/tags/helpers/TagsSelector.test.tsx
+++ b/test/tags/helpers/TagsSelector.test.tsx
@@ -1,77 +1,81 @@
-import { shallow, ShallowWrapper } from 'enzyme';
+import { screen } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import { TagsSelector as createTagsSelector } from '../../../src/tags/helpers/TagsSelector';
-import { ColorGenerator } from '../../../src/utils/services/ColorGenerator';
 import { TagsList } from '../../../src/tags/reducers/tagsList';
 import { Settings } from '../../../src/settings/reducers/settings';
+import { renderWithEvents } from '../../__helpers__/setUpTest';
+import { colorGeneratorMock } from '../../utils/services/__mocks__/ColorGenerator.mock';
 
 describe('<TagsSelector />', () => {
   const onChange = jest.fn();
-  const TagsSelector = createTagsSelector(Mock.all<ColorGenerator>());
+  const TagsSelector = createTagsSelector(colorGeneratorMock);
   const tags = ['foo', 'bar'];
   const tagsList = Mock.of<TagsList>({ tags: [...tags, 'baz'] });
-  let wrapper: ShallowWrapper;
+  const setUp = () => renderWithEvents(
+    <TagsSelector
+      selectedTags={tags}
+      tagsList={tagsList}
+      settings={Mock.all<Settings>()}
+      listTags={jest.fn()}
+      onChange={onChange}
+    />,
+  );
 
-  beforeEach(jest.clearAllMocks);
-  beforeEach(() => {
-    wrapper = shallow(
-      <TagsSelector
-        selectedTags={tags}
-        tagsList={tagsList}
-        settings={Mock.all<Settings>()}
-        listTags={jest.fn()}
-        onChange={onChange}
-      />,
-    );
-  });
+  afterEach(jest.clearAllMocks);
 
-  afterEach(() => wrapper?.unmount());
-
-  it('has expected props', () => {
-    expect(wrapper.prop('placeholderText')).toEqual('Add tags to the URL');
-    expect(wrapper.prop('allowNew')).toEqual(true);
-    expect(wrapper.prop('addOnBlur')).toEqual(true);
-    expect(wrapper.prop('minQueryLength')).toEqual(1);
+  it('has an input for tags', () => {
+    setUp();
+    expect(screen.getByPlaceholderText('Add tags to the URL')).toBeInTheDocument();
   });
 
   it('contains expected tags', () => {
-    expect(wrapper.prop('tags')).toEqual([
-      {
-        id: 'foo',
-        name: 'foo',
-      },
-      {
-        id: 'bar',
-        name: 'bar',
-      },
-    ]);
+    setUp();
+
+    expect(screen.getByText('foo')).toBeInTheDocument();
+    expect(screen.getByText('bar')).toBeInTheDocument();
   });
 
-  it('contains expected suggestions', () => {
-    expect(wrapper.prop('suggestions')).toEqual([
-      {
-        id: 'baz',
-        name: 'baz',
-      },
-    ]);
+  it('contains expected suggestions', async () => {
+    const { container, user } = setUp();
+
+    expect(container.querySelector('.react-tags__suggestions')).not.toBeInTheDocument();
+    expect(screen.queryByText('baz')).not.toBeInTheDocument();
+
+    await user.type(screen.getByPlaceholderText('Add tags to the URL'), 'ba');
+
+    expect(container.querySelector('.react-tags__suggestions')).toBeInTheDocument();
+    expect(screen.getByText('baz')).toBeInTheDocument();
   });
 
   it.each([
     ['The-New-Tag', [...tags, 'the-new-tag']],
-    ['comma,separated,tags', [...tags, 'comma', 'separated', 'tags']],
     ['foo', tags],
-  ])('invokes onChange when new tags are added', (newTag, expectedTags) => {
-    wrapper.simulate('addition', { name: newTag });
+  ])('invokes onChange when new tags are added', async (newTag, expectedTags) => {
+    const { user } = setUp();
 
+    expect(onChange).not.toHaveBeenCalled();
+    await user.type(screen.getByPlaceholderText('Add tags to the URL'), newTag);
+    await user.type(screen.getByPlaceholderText('Add tags to the URL'), '{Enter}');
     expect(onChange).toHaveBeenCalledWith(expectedTags);
   });
 
-  it.each([
-    [0, 'bar'],
-    [1, 'foo'],
-  ])('invokes onChange when tags are deleted', (index, expected) => {
-    wrapper.simulate('delete', index);
+  it('splits tags when several comma-separated ones are pasted', async () => {
+    const { user } = setUp();
 
+    expect(onChange).not.toHaveBeenCalled();
+    await user.click(screen.getByPlaceholderText('Add tags to the URL'));
+    await user.paste('comma,separated,tags');
+    await user.type(screen.getByPlaceholderText('Add tags to the URL'), '{Enter}');
+    expect(onChange).toHaveBeenCalledWith([...tags, 'comma', 'separated', 'tags']);
+  });
+
+  it.each([
+    ['foo', 'bar'],
+    ['bar', 'foo'],
+  ])('invokes onChange when tags are deleted', async (removedLabel, expected) => {
+    const { user } = setUp();
+
+    await user.click(screen.getByLabelText(`Remove ${removedLabel}`));
     expect(onChange).toHaveBeenCalledWith([expected]);
   });
 });