diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index d2819f42b..29ac1032d 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2616,9 +2616,8 @@ public class ServerConfig {
    * configuration with Docker containers via ebean-test-config.
    */
   private void autoConfiguration() {
-    Iterator<AutoConfigure> iterator = serviceLoad(AutoConfigure.class).iterator();
-    while (iterator.hasNext()) {
-      iterator.next().configure(this);
+    for (AutoConfigure autoConfigure : serviceLoad(AutoConfigure.class)) {
+      autoConfigure.configure(this);
     }
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
index 38222784a..9074eba55 100644
--- a/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
+++ b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
@@ -6,7 +6,6 @@ import org.avaje.classpath.scanner.ClassPathScannerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ServiceLoader;
 
 /**
  * Utility to finds and return the list of ClassPathScanner services.
@@ -19,13 +18,9 @@ public class ClassPathScanners {
   public static List<ClassPathScanner> find(ServerConfig serverConfig) {
 
     List<ClassPathScanner> scanners = new ArrayList<>();
-
-    ServiceLoader<ClassPathScannerFactory> scannerLoader = serverConfig.serviceLoad(ClassPathScannerFactory.class);
-    for (ClassPathScannerFactory factory : scannerLoader) {
-      ClassPathScanner scanner = factory.createScanner(serverConfig.getClassLoadConfig().getClassLoader());
-      scanners.add(scanner);
+    for (ClassPathScannerFactory factory : serverConfig.serviceLoad(ClassPathScannerFactory.class)) {
+      scanners.add(factory.createScanner(serverConfig.getClassLoadConfig().getClassLoader()));
     }
-
     return scanners;
   }
 }