diff --git a/src/main/java/com/googlesource/gerrit/plugins/scripting/scala/ScalaPluginScanner.java b/src/main/java/com/googlesource/gerrit/plugins/scripting/scala/ScalaPluginScanner.java
index 439c171..b893444 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/scripting/scala/ScalaPluginScanner.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/scripting/scala/ScalaPluginScanner.java
@@ -24,6 +24,7 @@
 import java.util.Enumeration;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 public class ScalaPluginScanner extends AbstractPreloadedPluginScanner {
   private final WebPluginScanner webScanner;
@@ -69,7 +70,7 @@
   }
 
   @Override
-  public Enumeration<PluginEntry> entries() {
+  public Stream<PluginEntry> entries() {
     return webScanner.entries();
   }
 }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/web/WebPluginScanner.java b/src/main/java/com/googlesource/gerrit/plugins/web/WebPluginScanner.java
index 6b31ed0..adfa2f1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/web/WebPluginScanner.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/web/WebPluginScanner.java
@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.jar.Manifest;
+import java.util.stream.Stream;
 
 public class WebPluginScanner implements PluginContentScanner {
   private final Path staticResourcesPath;
@@ -96,7 +97,7 @@
   }
 
   @Override
-  public Enumeration<PluginEntry> entries() {
+  public Stream<PluginEntry> entries() {
     final List<PluginEntry> resourcesList = Lists.newArrayList();
     try {
       Files.walkFileTree(
@@ -123,6 +124,6 @@
     } catch (IOException e) {
       throw new IllegalArgumentException("Cannot scan resource files in plugin", e);
     }
-    return Collections.enumeration(resourcesList);
+    return resourcesList.stream();
   }
 }