1 files changed, 9 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java b/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java
index 29482431aa0..9141ed45293 100644
--- a/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java
+++ b/config-model/src/main/java/com/yahoo/schema/ApplicationBuilder.java
@@ -132,6 +132,8 @@ public class ApplicationBuilder {
         this.deployLogger = deployLogger;
         this.properties = properties;
         this.documentsOnly = documentsOnly;
+        var list = new ArrayList<>(applicationPackage.getSchemas());
+        list.sort((a, b) -> a.getName().compareTo(b.getName()));
         for (NamedReader reader : applicationPackage.getSchemas())
             addSchema(reader);
     }
@@ -407,8 +409,13 @@ public class ApplicationBuilder {
                                                             properties,
                                                             rankProfileRegistry,
                                                             queryProfileRegistry);
-        for (var i = Files.list(new File(dir).toPath()).filter(p -> p.getFileName().toString().endsWith(".sd")).iterator(); i.hasNext(); ) {
-            builder.addSchemaFile(i.next().toString());
+
+        var fnli = Files.list(new File(dir).toPath())
+            .map(p -> p.toString())
+            .filter(fn -> fn.endsWith(".sd"))
+            .sorted();
+        for (var i = fnli.iterator(); i.hasNext(); ) {
+            builder.addSchemaFile(i.next());
         }
         builder.build(true);
         return builder;