diff --git a/package-lock.json b/package-lock.json
index 8b4884a8..9b2601bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1268,16 +1268,38 @@
         "aria-query": "3.0.0",
         "pretty-format": "^24.8.0",
         "wait-for-expect": "^1.2.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
+          "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.2"
+          }
+        }
       }
     },
     "@testing-library/react": {
-      "version": "8.0.7",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-8.0.7.tgz",
-      "integrity": "sha512-6XoeWSr3UCdxMswbkW0BmuXYw8a6w+stt+5gg4D4zAcljfhXETQ5o28bjJFwNab4OPg8gBNK8KIVot86L4Q8Vg==",
+      "version": "8.0.9",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-8.0.9.tgz",
+      "integrity": "sha512-I7zd+MW5wk8rQA5VopZgBfxGKUd91jgZ6Vzj2gMqFf2iGGtKwvI5SVTrIJcSFaOXK88T2EUsbsIKugDtoqOcZQ==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.5.4",
-        "@testing-library/dom": "^5.5.4"
+        "@babel/runtime": "^7.5.5",
+        "@testing-library/dom": "^5.6.1"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
+          "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.2"
+          }
+        }
       }
     },
     "@textlint/ast-node-types": {
@@ -10214,27 +10236,26 @@
       }
     },
     "react": {
-      "version": "16.8.6",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
-      "integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz",
+      "integrity": "sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==",
       "dev": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.13.6"
+        "prop-types": "^15.6.2"
       }
     },
     "react-dom": {
-      "version": "16.8.6",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.6.tgz",
-      "integrity": "sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==",
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.9.0.tgz",
+      "integrity": "sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==",
       "dev": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
-        "scheduler": "^0.13.6"
+        "scheduler": "^0.15.0"
       }
     },
     "react-is": {
@@ -10828,9 +10849,9 @@
       "dev": true
     },
     "scheduler": {
-      "version": "0.13.6",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
-      "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz",
+      "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==",
       "dev": true,
       "requires": {
         "loose-envify": "^1.1.0",
@@ -12221,9 +12242,9 @@
       }
     },
     "wait-for-expect": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-1.2.0.tgz",
-      "integrity": "sha512-EJhKpA+5UHixduMBEGhTFuLuVgQBKWxkFbefOdj2bbk2/OpA5Opsc4aUTGmF+qJ+v3kTGxDRNYwKaT4j6g5n8Q==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-1.3.0.tgz",
+      "integrity": "sha512-8fJU7jiA96HfGPt+P/UilelSAZfhMBJ52YhKzlmZQvKEZU2EcD1GQ0yqGB6liLdHjYtYAoGVigYwdxr5rktvzA==",
       "dev": true
     },
     "walker": {
diff --git a/package.json b/package.json
index f3eb02e8..e9e02b46 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@babel/preset-env": "^7.4.5",
     "@babel/preset-flow": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
-    "@testing-library/react": "^8.0.1",
+    "@testing-library/react": "^8.0.9",
     "@types/react": "^16.8.20",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
@@ -75,8 +75,8 @@
     "opencollective": "^1.0.3",
     "prettier": "^1.18.2",
     "prettier-eslint-cli": "^4.7.1",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
+    "react": "^16.9.0",
+    "react-dom": "^16.9.0",
     "rollup": "^1.15.4",
     "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-commonjs": "^10.0.0",
diff --git a/src/Field.test.js b/src/Field.test.js
index 5fd351c4..ea5b7aa9 100644
--- a/src/Field.test.js
+++ b/src/Field.test.js
@@ -6,7 +6,13 @@ import Form from './ReactFinalForm'
 import Field from './Field'
 
 const onSubmitMock = values => {}
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+
+const timeout = ms => new Promise(resolve => setTimeout(resolve, ms))
+async function sleep(ms) {
+  await act(async () => {
+    await timeout(ms)
+  })
+}
 
 describe('Field', () => {
   afterEach(cleanup)
@@ -285,7 +291,7 @@ describe('Field', () => {
       <Form onSubmit={onSubmitMock} subscription={{ values: true }}>
         {() => (
           <form>
-            <Field name="name" format={format} formatOnBlur>
+            <Field name="name" format={format} formatOnBlur initialValue="">
               {({ input }) => (
                 <input
                   {...input}
@@ -381,7 +387,11 @@ describe('Field', () => {
   it('should pass multiple through to custom components', () => {
     const CustomSelect = jest.fn(({ input }) => <select {...input} />)
     render(
-      <Form onSubmit={onSubmitMock} subscription={{ values: true }}>
+      <Form
+        onSubmit={onSubmitMock}
+        initialValues={{ name: [] }}
+        subscription={{ values: true }}
+      >
         {() => (
           <form>
             <Field name="name" component={CustomSelect} multiple />
@@ -858,16 +868,12 @@ describe('Field', () => {
   })
 
   it('should use isEqual to calculate dirty/pristine', () => {
+    const isEqual = (a, b) => (a && a.toUpperCase()) === (b && b.toUpperCase())
     const { getByTestId } = render(
       <Form onSubmit={onSubmitMock} initialValues={{ name: 'bob' }}>
         {() => (
           <form>
-            <Field
-              name="name"
-              isEqual={(a, b) =>
-                (a && a.toUpperCase()) === (b && b.toUpperCase())
-              }
-            >
+            <Field name="name" isEqual={isEqual}>
               {({ input, meta }) => (
                 <div>
                   <div data-testid="dirty">
@@ -1044,7 +1050,7 @@ describe('Field', () => {
               name="name"
               component="input"
               validate={async value => {
-                await sleep(5)
+                await timeout(5)
                 return value === 'erikras' ? 'Username taken' : undefined
               }}
               data-testid="name"
diff --git a/src/ReactFinalForm.test.js b/src/ReactFinalForm.test.js
index 8b1bf3f6..7c9d0ffd 100644
--- a/src/ReactFinalForm.test.js
+++ b/src/ReactFinalForm.test.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { render, fireEvent, cleanup } from '@testing-library/react'
+import { render, fireEvent, cleanup, act } from '@testing-library/react'
 import 'jest-dom/extend-expect'
 import deepEqual from 'fast-deep-equal'
 import { ErrorBoundary, Toggle, wrapWith } from './testUtils'
@@ -7,7 +7,12 @@ import { createForm } from 'final-form'
 import { Form, Field, version, withTypes } from '.'
 
 const onSubmitMock = values => {}
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+const timeout = ms => new Promise(resolve => setTimeout(resolve, ms))
+async function sleep(ms) {
+  await act(async () => {
+    await timeout(ms)
+  })
+}
 
 describe('ReactFinalForm', () => {
   afterEach(cleanup)
@@ -509,7 +514,7 @@ describe('ReactFinalForm', () => {
     const { getByTestId, getByText } = render(
       <Form
         onSubmit={async () => {
-          await sleep(2)
+          await timeout(2)
         }}
       >
         {({ handleSubmit }) => (
@@ -869,22 +874,8 @@ describe('ReactFinalForm', () => {
   })
 
   it('should set submitting back to false after submit', async () => {
-    /**
-     * This test causes a warning:
-     *
-     * Warning: An update to ReactFinalForm inside a test was not wrapped in act(...).
-     *
-     * ...but it's working as expected:
-     * 1) We click "Submit"
-     * 2) Submission is async and takes 1ms
-     * 3) The form's state has to go to `submitting = true` and then back to `submitting = false`
-     *
-     * That state change when the submission completes is not an "act" from the
-     * user, but an internal state change. If you have an idea of how to fix this,
-     * please submit a PR. Thanks. -@erikras
-     */
     const onSubmit = jest.fn(async () => {
-      sleep(1)
+      await timeout(1)
     })
     const recordSubmitting = jest.fn()
     const { getByText } = render(