SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/firefox/internal/Executable.java‎
Lines changed: 9 additions & 5 deletions b/‎java/client/src/org/openqa/selenium/firefox/internal/Executable.java‎
Lines changed: 9 additions & 5 deletions
@@ -121,8 +121,11 @@ private static File locateFirefoxBinaryFromPlatform() {
 
     Platform current = Platform.getCurrent();
     if (current.is(WINDOWS)) {
-      binary =
-          findExistingBinary(WindowsUtils.getPathsInProgramFiles("Mozilla Firefox\\firefox.exe"));
+      ImmutableList.Builder<String> paths = new ImmutableList.Builder<>();
+      paths.addAll(WindowsUtils.getPathsInProgramFiles("Mozilla Firefox\\firefox.exe"));
+      paths.addAll(WindowsUtils.getPathsInProgramFiles("Firefox Developer Edition\\firefox.exe"));
+      paths.addAll(WindowsUtils.getPathsInProgramFiles("Nightly\\firefox.exe"));
+      binary = findExistingBinaries(paths.build()).stream().findFirst().orElse(null);
 
     } else if (current.is(MAC)) {
       binary = new File("/Applications/Firefox.app/Contents/MacOS/firefox-bin");
@@ -151,13 +154,14 @@ private static File locateFirefoxBinaryFromPlatform() {
     return null;
   }
 
-  private static File findExistingBinary(final ImmutableList<String> paths) {
+  private static ImmutableList<File> findExistingBinaries(final ImmutableList<String> paths) {
+    ImmutableList.Builder<File> found = new ImmutableList.Builder<>();
     for (String path : paths) {
       File file = new File(path);
       if (file.exists()) {
-        return file;
+        found.add(file);
       }
     }
-    return null;
+    return found.build();
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,11 @@ private static File locateFirefoxBinaryFromPlatform() {`
`121`	`121`
`122`	`122`	`Platform current = Platform.getCurrent();`
`123`	`123`	`if (current.is(WINDOWS)) {`
`124`		`- binary =`
`125`		`- findExistingBinary(WindowsUtils.getPathsInProgramFiles("Mozilla Firefox\\firefox.exe"));`
	`124`	`+ ImmutableList.Builder<String> paths = new ImmutableList.Builder<>();`
	`125`	`+ paths.addAll(WindowsUtils.getPathsInProgramFiles("Mozilla Firefox\\firefox.exe"));`
	`126`	`+ paths.addAll(WindowsUtils.getPathsInProgramFiles("Firefox Developer Edition\\firefox.exe"));`
	`127`	`+ paths.addAll(WindowsUtils.getPathsInProgramFiles("Nightly\\firefox.exe"));`
	`128`	`+ binary = findExistingBinaries(paths.build()).stream().findFirst().orElse(null);`
`126`	`129`
`127`	`130`	`} else if (current.is(MAC)) {`
`128`	`131`	`binary = new File("/Applications/Firefox.app/Contents/MacOS/firefox-bin");`
`@@ -151,13 +154,14 @@ private static File locateFirefoxBinaryFromPlatform() {`
`151`	`154`	`return null;`
`152`	`155`	`}`
`153`	`156`
`154`		`- private static File findExistingBinary(final ImmutableList<String> paths) {`
	`157`	`+ private static ImmutableList<File> findExistingBinaries(final ImmutableList<String> paths) {`
	`158`	`+ ImmutableList.Builder<File> found = new ImmutableList.Builder<>();`
`155`	`159`	`for (String path : paths) {`
`156`	`160`	`File file = new File(path);`
`157`	`161`	`if (file.exists()) {`
`158`		`- return file;`
	`162`	`+ found.add(file);`
`159`	`163`	`}`
`160`	`164`	`}`
`161`		`- return null;`
	`165`	`+ return found.build();`
`162`	`166`	`}`
`163`	`167`	`}`