diff --git a/completions/java b/completions/java
index 7d1cf1fed94..e8d81fb454e 100644
--- a/completions/java
+++ b/completions/java
@@ -217,7 +217,7 @@ _java()
     else
         if [[ "$prev" == -jar ]]; then
             # jar file completion
-            _filedir jar
+            _filedir '[jw]ar'
         else
             # classes completion
             _java_classes
diff --git a/test/fixtures/java/bashcomp.war b/test/fixtures/java/bashcomp.war
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/lib/completions/java.exp b/test/lib/completions/java.exp
index 864aabd665c..62f6fd9d6c9 100644
--- a/test/lib/completions/java.exp
+++ b/test/lib/completions/java.exp
@@ -44,7 +44,7 @@ assert_no_complete "java -cp \"\" "
 sync_after_int
 
 
-assert_complete "a/ bashcomp.jar" "java -jar $::srcdir/fixtures/java/"
+assert_complete "a/ bashcomp.jar bashcomp.war" "java -jar $::srcdir/fixtures/java/"
 
 
 sync_after_int