diff --git a/test/base.js b/test/base.js
index 2ba90f7f..ece957d7 100644
--- a/test/base.js
+++ b/test/base.js
@@ -26,7 +26,7 @@ const tmpdir = path.join(os.tmpdir(), 'yeoman-base');
 const resolveddir = path.join(os.tmpdir(), 'yeoman-base-generator');
 
 describe('Base', () => {
-  before(helpers.setUpTestDirectory(tmpdir));
+  beforeEach(helpers.setUpTestDirectory(tmpdir));
 
   beforeEach(function () {
     this.env = yeoman.createEnv([], {'skip-install': true}, new TestAdapter());
@@ -999,7 +999,7 @@ describe('Base', () => {
   });
 
   describe('Events', () => {
-    before(function () {
+    beforeEach(function () {
       class Generator extends Base {}
       this.Generator = Generator;
       Generator.namespace = 'angular:app';
diff --git a/test/storage.js b/test/storage.js
index f5b1f6d1..6592910a 100644
--- a/test/storage.js
+++ b/test/storage.js
@@ -17,7 +17,7 @@ function rm(filepath) {
 }
 
 describe('Storage', () => {
-  before(helpers.setUpTestDirectory(tmpdir));
+  beforeEach(helpers.setUpTestDirectory(tmpdir));
 
   beforeEach(function () {
     this.beforeDir = process.cwd();
diff --git a/test/user.js b/test/user.js
index 243dc977..3cd3714b 100644
--- a/test/user.js
+++ b/test/user.js
@@ -13,7 +13,7 @@ const Base = require('..');
 const tmpdir = path.join(os.tmpdir(), 'yeoman-user');
 
 describe('Base#user', () => {
-  before(function () {
+  beforeEach(function () {
     this.prevCwd = process.cwd();
     this.tmp = tmpdir;
     makeDir.sync(path.join(tmpdir, 'subdir'));
@@ -23,7 +23,7 @@ describe('Base#user', () => {
     shell.exec('git config --local user.email yo@yeoman.io');
   });
 
-  after(function (done) {
+  afterEach(function (done) {
     process.chdir(this.prevCwd);
     rimraf(tmpdir, done);
   });