diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
index a139d8e763e..9b7f7d29b93 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
@@ -46,7 +46,6 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
             *quoteIfNeeded(args)
         )
         pb.directory(workDirectory)
-        pb.environment().remove("_KOTLIN_RUNNER") // FIXME: HACK
         val process = pb.start()
         val stdout = StringUtil.convertLineSeparators(process.inputStream.bufferedReader().use { it.readText() })
         val stderr = StringUtil.convertLineSeparators(process.errorStream.bufferedReader().use { it.readText() })
@@ -64,6 +63,8 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
             System.err.println("=== STDERR ===")
             System.err.println(stderr)
             throw e
+        } finally {
+            process.destroy()
         }
     }