diff --git a/webpack/assets/javascripts/react_app/components/common/dates/IsoDate.test.js b/webpack/assets/javascripts/react_app/components/common/dates/IsoDate.test.js
index 5afa3a6e37..e8d9597c2e 100644
--- a/webpack/assets/javascripts/react_app/components/common/dates/IsoDate.test.js
+++ b/webpack/assets/javascripts/react_app/components/common/dates/IsoDate.test.js
@@ -1,35 +1,35 @@
-/* eslint-disable promise/prefer-await-to-then */
-// Configure Enzyme
-import { mount } from 'enzyme';
 import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import IsoDate from './IsoDate';
 import { i18nProviderWrapperFactory } from '../../../common/i18nProviderWrapperFactory';
-import { intl } from '../../../common/I18n';
 
-describe('Date', () => {
+describe('IsoDate', () => {
   const date = new Date('2017-10-13 00:54:55 -1100');
   const now = new Date('2017-10-28 00:00:00 -1100');
-  const IntlDate = i18nProviderWrapperFactory(now, 'UTC')(IsoDate);
 
-  it('formats date', () => {
-    const wrapper = mount(
-      <IntlDate date={date} defaultValue="Default value" />
-    );
+  const renderIsoDate = (props = {}) => {
+    const IntlIsoDate = i18nProviderWrapperFactory(now, 'UTC')(IsoDate);
 
-    intl.ready.then(() => {
-      wrapper.update();
-      expect(wrapper.find('IsoDate')).toMatchSnapshot();
-    });
+    return render(<IntlIsoDate defaultValue="Default value" {...props} />);
+  };
+
+  it('formats the date as month/day/year', async () => {
+    renderIsoDate({ date });
+
+    expect(await screen.findByText('10/13/2017')).toBeInTheDocument();
+  });
+
+  it('sets the title to the relative time', async () => {
+    renderIsoDate({ date });
+
+    await screen.findByText('10/13/2017');
+    expect(screen.getByTitle('15 days ago')).toBeInTheDocument();
   });
 
-  it('renders default value', () => {
-    const wrapper = mount(
-      <IntlDate date={null} defaultValue="Default value" />
-    );
+  it('renders the default value when no date is provided', async () => {
+    renderIsoDate({ date: null });
 
-    intl.ready.then(() => {
-      wrapper.update();
-      expect(wrapper.find('IsoDate')).toMatchSnapshot();
-    });
+    expect(await screen.findByText('Default value')).toBeInTheDocument();
   });
 });
diff --git a/webpack/assets/javascripts/react_app/components/common/dates/__snapshots__/IsoDate.test.js.snap b/webpack/assets/javascripts/react_app/components/common/dates/__snapshots__/IsoDate.test.js.snap
deleted file mode 100644
index 7f6554f127..0000000000
--- a/webpack/assets/javascripts/react_app/components/common/dates/__snapshots__/IsoDate.test.js.snap
+++ /dev/null
@@ -1,34 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Date formats date 1`] = `
-<IsoDate
-  date={2017-10-13T11:54:55.000Z}
-  defaultValue="Default value"
->
-  <span
-    title="15 days ago"
-  >
-    <FormattedDate
-      day="2-digit"
-      month="2-digit"
-      value={2017-10-13T11:54:55.000Z}
-      year="numeric"
-    >
-      <span>
-        10/13/2017
-      </span>
-    </FormattedDate>
-  </span>
-</IsoDate>
-`;
-
-exports[`Date renders default value 1`] = `
-<IsoDate
-  date={null}
-  defaultValue="Default value"
->
-  <span>
-    Default value
-  </span>
-</IsoDate>
-`;