diff --git a/pkg/server/container_remove.go b/pkg/server/container_remove.go
index 62990a4bb..e6d737378 100644
--- a/pkg/server/container_remove.go
+++ b/pkg/server/container_remove.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/errdefs"
+	"github.com/docker/docker/pkg/system"
 	"github.com/golang/glog"
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
@@ -63,7 +64,7 @@ func (c *criContainerdService) RemoveContainer(ctx context.Context, r *runtime.R
 	// so we don't need the "Dead" state for now.
 
 	containerRootDir := getContainerRootDir(c.rootDir, id)
-	if err := c.os.RemoveAll(containerRootDir); err != nil {
+	if err := system.EnsureRemoveAll(containerRootDir); err != nil {
 		return nil, fmt.Errorf("failed to remove container root directory %q: %v",
 			containerRootDir, err)
 	}
diff --git a/pkg/server/sandbox_remove.go b/pkg/server/sandbox_remove.go
index 3e463453d..23057957e 100644
--- a/pkg/server/sandbox_remove.go
+++ b/pkg/server/sandbox_remove.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/errdefs"
+	"github.com/docker/docker/pkg/system"
 	"github.com/golang/glog"
 	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
@@ -73,7 +74,7 @@ func (c *criContainerdService) RemovePodSandbox(ctx context.Context, r *runtime.
 
 	// Cleanup the sandbox root directory.
 	sandboxRootDir := getSandboxRootDir(c.rootDir, id)
-	if err := c.os.RemoveAll(sandboxRootDir); err != nil {
+	if err := system.EnsureRemoveAll(sandboxRootDir); err != nil {
 		return nil, fmt.Errorf("failed to remove sandbox root directory %q: %v",
 			sandboxRootDir, err)
 	}