diff --git a/src/test/java/com/android/tools/r8/KotlinCompilerTool.java b/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
index 268709d..90763af 100644
--- a/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
+++ b/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -13,7 +13,6 @@
 import com.android.tools.r8.TestRuntime.CfRuntime;
 import com.android.tools.r8.ToolHelper.ProcessResult;
 import com.android.tools.r8.utils.FileUtils;
-import com.android.tools.r8.utils.ZipUtils;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -98,7 +97,6 @@
   }
 
   private ProcessResult compileInternal(Path output) throws IOException {
-    Path outdir = Files.isDirectory(output) ? output : state.getNewTempFolder();
     List<String> cmdline = new ArrayList<>();
     cmdline.add(jdk.getJavaExecutable().toString());
     cmdline.add("-jar");
@@ -120,11 +118,6 @@
           .collect(Collectors.joining(isWindows() ? ";" : ":")));
     }
     ProcessBuilder builder = new ProcessBuilder(cmdline);
-    ProcessResult kotlincResult = ToolHelper.runProcess(builder);
-    if (FileUtils.isJarFile(output)) {
-      assert !outdir.equals(output);
-      ZipUtils.zip(output, outdir);
-    }
-    return kotlincResult;
+    return ToolHelper.runProcess(builder);
   }
 }
