SeleniumHQ
diff --git a/‎java/server/src/org/openqa/selenium/grid/web/ResourceHandler.java‎
Lines changed: 5 additions & 0 deletions b/‎java/server/src/org/openqa/selenium/grid/web/ResourceHandler.java‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎java/server/test/org/openqa/selenium/grid/web/ResourceHandlerTest.java‎
Lines changed: 13 additions & 0 deletions b/‎java/server/test/org/openqa/selenium/grid/web/ResourceHandlerTest.java‎
Lines changed: 13 additions & 0 deletions
@@ -75,6 +75,11 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
     Resource resource = result.get();
 
     if (resource.isDirectory()) {
+      Optional<Resource> index = resource.get("index.html");
+      if (index.isPresent()) {
+        return readFile(req, index.get());
+      }
+
       return readDirectory(req, resource);
     }
     return readFile(req, resource);
 
@@ -109,4 +109,17 @@ public void canBeNestedWithinARoute() throws IOException {
     assertThat(Contents.string(res)).isEqualTo("delicious");
   }
 
+  @Test
+  public void shouldRedirectToIndexPageIfOneExists() throws IOException {
+    Path index = base.resolve("index.html");
+    Files.write(index, "Cheese".getBytes(UTF_8));
+
+    ResourceHandler handler = new ResourceHandler(new PathResource(base));
+    HttpResponse res = handler.execute(new HttpRequest(GET, "/"));
+
+    assertThat(res.isSuccessful()).isTrue();
+
+    String content = Contents.string(res);
+    assertThat(content).isEqualTo("Cheese");
+  }
 }