diff --git a/test/tap/configuration-validation-test.js b/test/tap/configuration-validation-test.js
index 5350eac..e977c6d 100644
--- a/test/tap/configuration-validation-test.js
+++ b/test/tap/configuration-validation-test.js
@@ -256,7 +256,7 @@ test("log4js configuration validation", batch => {
 
   batch.test("should not throw error if configure object is freezed", t => {
     const testFile = "test/tap/freeze-date-file-test";
-    t.tearDown(() => {
+    t.teardown(() => {
       removeFiles(testFile);
     });
     t.doesNotThrow(() =>
diff --git a/test/tap/dateFileAppender-test.js b/test/tap/dateFileAppender-test.js
index 3964991..8baa968 100644
--- a/test/tap/dateFileAppender-test.js
+++ b/test/tap/dateFileAppender-test.js
@@ -25,7 +25,7 @@ test("../../lib/appenders/dateFile", batch => {
     const logger = log4js.getLogger("default-settings");
 
     logger.info("This should be in the file.");
-    t.tearDown(() => {
+    t.teardown(() => {
       removeFile("date-appender-default.log");
     });
 
@@ -72,7 +72,7 @@ test("../../lib/appenders/dateFile", batch => {
       );
     });
 
-    t.tearDown(() => {
+    t.teardown(() => {
       removeFile("date-file-test.log");
     });
   });
@@ -108,7 +108,7 @@ test("../../lib/appenders/dateFile", batch => {
     const logger = log4js.getLogger("tests");
     logger.warn("this should be written to the file with the appended date");
 
-    t.tearDown(() => {
+    t.teardown(() => {
       removeFile(testFile);
     });
 
@@ -140,7 +140,7 @@ test("../../lib/appenders/dateFile", batch => {
     logger.info("1");
     logger.info("2");
     logger.info("3");
-    t.tearDown(() => {
+    t.teardown(() => {
       removeFile("date-appender-flush.log");
     });
 
diff --git a/test/tap/file-descriptor-leak-test.js b/test/tap/file-descriptor-leak-test.js
index 55a04b3..7436a8e 100644
--- a/test/tap/file-descriptor-leak-test.js
+++ b/test/tap/file-descriptor-leak-test.js
@@ -67,7 +67,7 @@ if (process.platform !== "win32") {
       }, 250);
     });
 
-    batch.tearDown(async () => {
+    batch.teardown(async () => {
       log4js.shutdown();
 
       const filenames = Object.values(config.appenders).map(appender => appender.filename);
diff --git a/test/tap/file-sighup-test.js b/test/tap/file-sighup-test.js
index c9682d9..cf059b2 100644
--- a/test/tap/file-sighup-test.js
+++ b/test/tap/file-sighup-test.js
@@ -38,7 +38,7 @@ test("file appender single SIGHUP handler", t => {
   const log4js = require("../../lib/log4js");
   log4js.configure(config);
 
-  t.tearDown(async () => {
+  t.teardown(async () => {
     log4js.shutdown();
 
     const filenames = Object.values(config.appenders).map(appender => appender.filename);
@@ -120,7 +120,7 @@ test("file appender SIGHUP handler leak", t => {
     },
     categories: { default: { appenders: ["file"], level: "info" } }
   });
-  t.tearDown(async () => {
+  t.teardown(async () => {
     await removeFiles("test.log");
   });
   t.plan(2);
diff --git a/test/tap/fileAppender-test.js b/test/tap/fileAppender-test.js
index 44d48b2..02eaca6 100644
--- a/test/tap/fileAppender-test.js
+++ b/test/tap/fileAppender-test.js
@@ -24,7 +24,7 @@ test("log4js fileAppender", batch => {
     const logger = log4js.getLogger("default-settings");
     await removeFile(testFile);
 
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await new Promise(resolve => log4js.shutdown(resolve));
       await removeFile(testFile);
     });
@@ -50,7 +50,7 @@ test("log4js fileAppender", batch => {
     const testFile = path.join(__dirname, "fa-default-test.log");
     await removeFile(testFile);
 
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await new Promise(resolve => log4js.shutdown(resolve));
       await removeFile(testFile);
     });
@@ -80,7 +80,7 @@ test("log4js fileAppender", batch => {
     const testFile = path.join(__dirname, "fa-maxFileSize-test.log");
     const logger = log4js.getLogger("max-file-size");
 
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await new Promise(resolve => log4js.shutdown(resolve));
       await removeFile(testFile);
     });
@@ -121,7 +121,7 @@ test("log4js fileAppender", batch => {
     const testFile = path.join(__dirname, "fa-maxFileSize-unit-test.log");
     const logger = log4js.getLogger("max-file-size-unit");
 
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await new Promise(resolve => log4js.shutdown(resolve));
       await Promise.all([removeFile(testFile), removeFile(`${testFile}.1`)]);
     });
@@ -174,7 +174,7 @@ test("log4js fileAppender", batch => {
       removeFile(`${testFile}.2`)
     ]);
 
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await new Promise(resolve => log4js.shutdown(resolve));
       await Promise.all([
         removeFile(testFile),
@@ -234,7 +234,7 @@ test("log4js fileAppender", batch => {
       removeFile(`${testFile}.2.gz`)
     ]);
 
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await new Promise(resolve => log4js.shutdown(resolve));
       await Promise.all([
         removeFile(testFile),
@@ -350,7 +350,7 @@ test("log4js fileAppender", batch => {
     await removeFile(testFilePlain);
     await removeFile(testFileAsIs);
 
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await new Promise(resolve => log4js.shutdown(resolve));
       await removeFile(testFilePlain);
       await removeFile(testFileAsIs);
diff --git a/test/tap/fileSyncAppender-test.js b/test/tap/fileSyncAppender-test.js
index b1c0188..bb068ad 100644
--- a/test/tap/fileSyncAppender-test.js
+++ b/test/tap/fileSyncAppender-test.js
@@ -18,7 +18,7 @@ test("log4js fileSyncAppender", batch => {
     const logger = log4js.getLogger("default-settings");
     remove(testFile);
 
-    t.tearDown(() => {
+    t.teardown(() => {
       remove(testFile);
     });
 
@@ -44,7 +44,7 @@ test("log4js fileSyncAppender", batch => {
     const logger = log4js.getLogger("max-file-size");
     remove(testFile);
 
-    t.tearDown(() => {
+    t.teardown(() => {
       remove(testFile);
     });
 
@@ -93,7 +93,7 @@ test("log4js fileSyncAppender", batch => {
     remove(testFile);
     remove(`${testFile}.1`);
 
-    t.tearDown(() => {
+    t.teardown(() => {
       remove(testFile);
       remove(`${testFile}.1`);
     });
@@ -148,7 +148,7 @@ test("log4js fileSyncAppender", batch => {
     remove(`${testFile}.1`);
     remove(`${testFile}.2`);
 
-    t.tearDown(() => {
+    t.teardown(() => {
       remove(testFile);
       remove(`${testFile}.1`);
       remove(`${testFile}.2`);
@@ -218,7 +218,7 @@ test("log4js fileSyncAppender", batch => {
     const testFile = "tmp-sync-tests.log";
     remove(testFile);
 
-    t.tearDown(() => {
+    t.teardown(() => {
       remove(testFile);
     });
 
@@ -252,7 +252,7 @@ test("log4js fileSyncAppender", batch => {
     const testFile = "tmp-options-tests.log";
     remove(testFile);
 
-    t.tearDown(() => {
+    t.teardown(() => {
       remove(testFile);
     });
 
diff --git a/test/tap/logLevelFilter-test.js b/test/tap/logLevelFilter-test.js
index c079e13..27e31f0 100644
--- a/test/tap/logLevelFilter-test.js
+++ b/test/tap/logLevelFilter-test.js
@@ -58,7 +58,7 @@ test("log4js logLevelFilter", batch => {
     remove(`${__dirname}/logLevelFilter-warnings.log`);
     remove(`${__dirname}/logLevelFilter-debugs.log`);
 
-    t.tearDown(() => {
+    t.teardown(() => {
       remove(`${__dirname}/logLevelFilter.log`);
       remove(`${__dirname}/logLevelFilter-warnings.log`);
       remove(`${__dirname}/logLevelFilter-debugs.log`);
diff --git a/test/tap/multi-file-appender-test.js b/test/tap/multi-file-appender-test.js
index aa93f7c..14cd42e 100644
--- a/test/tap/multi-file-appender-test.js
+++ b/test/tap/multi-file-appender-test.js
@@ -15,7 +15,7 @@ test("multiFile appender", batch => {
   batch.test(
     "should write to multiple files based on the loggingEvent property",
     t => {
-      t.tearDown(async () => {
+      t.teardown(async () => {
         await removeFiles(["logs/A.log", "logs/B.log"]);
       });
       log4js.configure({
@@ -44,7 +44,7 @@ test("multiFile appender", batch => {
   batch.test(
     "should write to multiple files based on loggingEvent.context properties",
     t => {
-      t.tearDown(async () => {
+      t.teardown(async () => {
         await removeFiles(["logs/C.log", "logs/D.log"]);
       });
       log4js.configure({
@@ -73,7 +73,7 @@ test("multiFile appender", batch => {
   );
 
   batch.test("should close file after timeout", t => {
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await removeFiles("logs/C.log");
     });
     /* checking that the file is closed after a timeout is done by looking at the debug logs
@@ -120,7 +120,7 @@ test("multiFile appender", batch => {
   batch.test(
     "should fail silently if loggingEvent property has no value",
     t => {
-      t.tearDown(async () => {
+      t.teardown(async () => {
         await removeFiles("logs/E.log");
       });
       log4js.configure({
@@ -152,7 +152,7 @@ test("multiFile appender", batch => {
   );
 
   batch.test("should pass options to rolling file stream", t => {
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await removeFiles(["logs/F.log", "logs/F.log.1", "logs/F.log.2"]);
     });
     log4js.configure({
@@ -186,7 +186,7 @@ test("multiFile appender", batch => {
   });
 
   batch.test("should inherit config from category hierarchy", t => {
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await removeFiles("logs/test.someTest.log");
     });
     log4js.configure({
@@ -236,7 +236,7 @@ test("multiFile appender", batch => {
     });
   });
 
-  batch.tearDown(async () => {
+  batch.teardown(async () => {
     try {
       const files = fs.readdirSync("logs");
       await removeFiles(files.map(filename => `logs/${filename}`));
diff --git a/test/tap/pause-test.js b/test/tap/pause-test.js
index 37d1230..fc8ef6c 100644
--- a/test/tap/pause-test.js
+++ b/test/tap/pause-test.js
@@ -12,7 +12,7 @@ const removeFiles = async filenames => {
 tap.test("Drain event test", batch => {
 
   batch.test("Should emit pause event and resume when logging in a file with high frequency", t => {
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await removeFiles("logs/drain.log");
     });
     // Generate logger with 5k of highWaterMark config
@@ -47,7 +47,7 @@ tap.test("Drain event test", batch => {
 
 
   batch.test("Should emit pause event and resume when logging in a date file with high frequency", (t) => {
-    t.tearDown(async () => {
+    t.teardown(async () => {
       await removeFiles("logs/date-file-drain.log");
     });
     // Generate date file logger with 5kb of highWaterMark config
@@ -79,7 +79,7 @@ tap.test("Drain event test", batch => {
     t.end();
   });
 
-  batch.tearDown(async () => {
+  batch.teardown(async () => {
     try {
       const files = fs.readdirSync("logs");
       await removeFiles(files.map(filename => `logs/${filename}`));