diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go
index 5f32d1c1d2b8..348b676f6285 100644
--- a/integration-cli/docker_cli_save_load_test.go
+++ b/integration-cli/docker_cli_save_load_test.go
@@ -283,7 +283,6 @@ func (s *DockerSuite) TestSaveDirectoryPermissions(c *testing.T) {
 
 	found := false
 	for _, entry := range dirs {
-		var entriesSansDev []string
 		if entry.IsDir() {
 			layerPath := filepath.Join(extractionDirectory, entry.Name(), "layer.tar")
 
@@ -293,14 +292,19 @@ func (s *DockerSuite) TestSaveDirectoryPermissions(c *testing.T) {
 			defer f.Close()
 
 			entries, err := listTar(f)
+			assert.NilError(c, err, "encountered error while listing tar entries: %s", err)
+
+			var entriesSansBuiltin []string
 			for _, e := range entries {
-				if !strings.Contains(e, "dev/") {
-					entriesSansDev = append(entriesSansDev, e)
+				// Filter out built-in directories added to layers (like /dev
+				// inodes and /tmp tmpfs) since those may change if our default
+				// config changes.
+				if !strings.Contains(e, "dev/") && e != "tmp/" {
+					entriesSansBuiltin = append(entriesSansBuiltin, e)
 				}
 			}
-			assert.NilError(c, err, "encountered error while listing tar entries: %s", err)
 
-			if reflect.DeepEqual(entriesSansDev, layerEntries) || reflect.DeepEqual(entriesSansDev, layerEntriesAUFS) {
+			if reflect.DeepEqual(entriesSansBuiltin, layerEntries) || reflect.DeepEqual(entriesSansBuiltin, layerEntriesAUFS) {
 				found = true
 				break
 			}