diff --git a/src/main/java/com/google/devtools/j2objc/types/ImportCollector.java b/src/main/java/com/google/devtools/j2objc/types/ImportCollector.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/google/devtools/j2objc/types/ImportCollector.java
+++ b/src/main/java/com/google/devtools/j2objc/types/ImportCollector.java
@@ -188,8 +188,10 @@ public class ImportCollector extends ErrorReportingASTVisitor {
     }
 
     public String getImportFileName() {
-      // Always use JRE package directories.
-      if (Options.usePackageDirectories() || javaFileName.startsWith("java")) {
+      // Always use JRE and JUnit package directories, since the j2objc
+      // distribution is (currently) built with package directories.
+      if (Options.usePackageDirectories() || javaFileName.startsWith("java") ||
+          javaFileName.startsWith("junit")) {
         return javaFileName.replace('.', '/');
       }
       return javaFileName.substring(javaFileName.lastIndexOf('.') + 1);
Added junit headers to list of imports that always use package directories,
since they are included with the j2objc distribution (but <I>).