diff --git a/app/current/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala b/app/current/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala
index a7ca7fac6..417cd740d 100644
--- a/app/current/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala
+++ b/app/current/src/test/scala/io/scalajs/nodejs/fs/FsClassesTest.scala
@@ -2,9 +2,6 @@ package io.scalajs.nodejs.fs
 
 import org.scalatest.FunSpec
 
-import scala.scalajs.js
-import scala.scalajs.js.typedarray.Uint8Array
-
 /**
   * File System (Fs) Tests
   *
diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/ConsoleTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala
similarity index 84%
rename from app/nodejs-v10/src/test/scala/io/scalajs/nodejs/ConsoleTest.scala
rename to app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala
index 4fdbc5f8e..2b6b68560 100644
--- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/ConsoleTest.scala
+++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala
@@ -1,8 +1,7 @@
-package io.scalajs.nodejs
+package io.scalajs.nodejs.console_module
 
-import io.scalajs.nodejs.console_module.{Console, ConsoleOptions}
 import io.scalajs.nodejs.fs.Fs
-import org.scalatest.{BeforeAndAfterEach, FunSpec}
+import org.scalatest.{ BeforeAndAfterEach, FunSpec }
 
 import scala.scalajs.js
 
diff --git a/app/nodejs-v10/src/test/scala/nodejs/dns/DNSAsyncTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala
similarity index 100%
rename from app/nodejs-v10/src/test/scala/nodejs/dns/DNSAsyncTest.scala
rename to app/nodejs-v10/src/test/scala/io/scalajs/nodejs/dns/DNSAsyncTest.scala
diff --git a/app/nodejs-v8/src/test/scala/io/scalajs/nodejs/ConsoleTest.scala b/app/nodejs-v8/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala
similarity index 69%
rename from app/nodejs-v8/src/test/scala/io/scalajs/nodejs/ConsoleTest.scala
rename to app/nodejs-v8/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala
index ae93da754..43b4b72e8 100644
--- a/app/nodejs-v8/src/test/scala/io/scalajs/nodejs/ConsoleTest.scala
+++ b/app/nodejs-v8/src/test/scala/io/scalajs/nodejs/console_module/ConsoleTest.scala
@@ -1,21 +1,24 @@
-package io.scalajs.nodejs
+package io.scalajs.nodejs.console_module
 
-import io.scalajs.nodejs.console_module.Console
-import io.scalajs.nodejs.fs.Fs
+import io.scalajs.nodejs.TestEnvironment
+import io.scalajs.nodejs.fs.{Fs, WriteStream}
 import org.scalatest.{BeforeAndAfterEach, FunSpec}
 
 import scala.scalajs.js.JavaScriptException
 
 class ConsoleTest extends FunSpec with BeforeAndAfterEach {
 
-  private val logFileName = "x.nodejs8.ConsoleTest"
+  private val logFileName                  = "x.nodejs8.ConsoleTest"
+  private var failingWritable: WriteStream = null
 
   override def afterEach(): Unit = {
     if (Fs.existsSync(logFileName)) Fs.unlinkSync(logFileName)
   }
 
-  private val failingWritable = Fs.createWriteStream(logFileName)
-  failingWritable.close(_ => {})
+  override def beforeEach(): Unit = {
+    failingWritable = Fs.createWriteStream(logFileName)
+    failingWritable.close(_ => {})
+  }
 
   it("have constructor(stdout, stderr, ignoreErrors) added in v8.0.0") {
     val looseConsole = new Console(