diff --git a/command/agent/config.go b/command/agent/config.go
index 8ee166842f9..52bd0911bab 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"sort"
 	"strings"
 	"time"
 
@@ -705,6 +706,8 @@ func LoadConfigDir(dir string) (*Config, error) {
 		return &Config{}, nil
 	}
 
+	sort.Strings(files)
+
 	var result *Config
 	for _, f := range files {
 		config, err := LoadConfigFile(f)