diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 968c153e6c4..25cd9fa3e59 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -27,6 +27,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -394,6 +395,8 @@ func (kl *Kubelet) extractFromDir(name string) ([]api.ContainerManifest, error)
 		return manifests, err
 	}
 
+	sort.Strings(files)
+
 	for _, file := range files {
 		manifest, err := kl.extractFromFile(file)
 		if err != nil {
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index b0c7b24bf2c..24a3f567380 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -785,8 +785,8 @@ func TestExtractFromDir(t *testing.T) {
 	kubelet := Kubelet{}
 
 	manifests := []api.ContainerManifest{
-		{Id: "foo"},
-		{Id: "bar"},
+		{Id: "aaaa"},
+		{Id: "bbbb"},
 	}
 
 	dirName, err := ioutil.TempDir("", "foo")
@@ -795,7 +795,7 @@ func TestExtractFromDir(t *testing.T) {
 	for _, manifest := range manifests {
 		data, err := json.Marshal(manifest)
 		expectNoError(t, err)
-		file, err := ioutil.TempFile(dirName, "kub")
+		file, err := ioutil.TempFile(dirName, manifest.Id)
 		expectNoError(t, err)
 		name := file.Name()
 		expectNoError(t, file.Close())