diff --git a/e2e/__tests__/workerForceExit.test.ts b/e2e/__tests__/workerForceExit.test.ts
index 3d80d65a4e45..87bc44c09598 100644
--- a/e2e/__tests__/workerForceExit.test.ts
+++ b/e2e/__tests__/workerForceExit.test.ts
@@ -19,13 +19,13 @@ import runJest from '../runJest';
 const DIR = resolve(tmpdir(), 'worker-force-exit');
 
 beforeEach(() => cleanup(DIR));
+afterEach(() => cleanup(DIR));
 const testFiles = {
   ...generateTestFilesToForceUsingWorkers(),
   'package.json': `{
       "testEnvironment": "node"
   }`,
 };
-afterEach(() => cleanup(DIR));
 
 const verifyNumPassed = stderr => {
   const numberOfTestsPassed = (stderr.match(/\bPASS\b/g) || []).length;
diff --git a/packages/jest-worker/src/__tests__/index.test.js b/packages/jest-worker/src/__tests__/index.test.js
index db0e2787ad32..5fbd5293fef5 100644
--- a/packages/jest-worker/src/__tests__/index.test.js
+++ b/packages/jest-worker/src/__tests__/index.test.js
@@ -133,7 +133,7 @@ it('does not let make calls after the farm is ended', () => {
   );
 });
 
-it('does not let end the farm after it is ended', () => {
+it('does not let end the farm after it is ended', async () => {
   const farm = new Farm('/tmp/baz.js', {
     exposedMethods: ['foo', 'bar'],
     numWorkers: 4,
@@ -141,10 +141,10 @@ it('does not let end the farm after it is ended', () => {
 
   farm.end();
   expect(farm._workerPool.end).toHaveBeenCalledTimes(1);
-  expect(farm.end()).rejects.toThrow(
+  await expect(farm.end()).rejects.toThrow(
     'Farm is ended, no more calls can be done to it',
   );
-  expect(farm.end()).rejects.toThrow(
+  await expect(farm.end()).rejects.toThrow(
     'Farm is ended, no more calls can be done to it',
   );
   expect(farm._workerPool.end).toHaveBeenCalledTimes(1);
diff --git a/packages/jest-worker/src/index.ts b/packages/jest-worker/src/index.ts
index 459c5ac43f88..c0b4762a0f53 100644
--- a/packages/jest-worker/src/index.ts
+++ b/packages/jest-worker/src/index.ts
@@ -143,6 +143,6 @@ export default class JestWorker {
     }
     this._ending = true;
 
-    return await this._workerPool.end();
+    return this._workerPool.end();
   }
 }