diff --git a/container.go b/container.go
index 733a31d5a2..218ae1e4a8 100644
--- a/container.go
+++ b/container.go
@@ -829,10 +829,10 @@ func (container *Container) cleanup() {
 			utils.Errorf("%s: Error close stdin: %s", container.ID, err)
 		}
 	}
-	if err := container.stdout.Close(); err != nil {
+	if err := container.stdout.CloseWriters(); err != nil {
 		utils.Errorf("%s: Error close stdout: %s", container.ID, err)
 	}
-	if err := container.stderr.Close(); err != nil {
+	if err := container.stderr.CloseWriters(); err != nil {
 		utils.Errorf("%s: Error close stderr: %s", container.ID, err)
 	}
 	if container.command.Terminal != nil {
diff --git a/execdriver/term.go b/execdriver/term.go
index ab399e8337..ec3c368012 100644
--- a/execdriver/term.go
+++ b/execdriver/term.go
@@ -14,10 +14,10 @@ type Term interface {
 
 type Pipes struct {
 	Stdin          io.ReadCloser
-	Stdout, Stderr io.WriteCloser
+	Stdout, Stderr io.Writer
 }
 
-func NewPipes(stdin io.ReadCloser, stdout, stderr io.WriteCloser, useStdin bool) *Pipes {
+func NewPipes(stdin io.ReadCloser, stdout, stderr io.Writer, useStdin bool) *Pipes {
 	p := &Pipes{
 		Stdout: stdout,
 		Stderr: stderr,
@@ -76,7 +76,11 @@ func (t *TtyConsole) attach(command *Command, pipes *Pipes) error {
 	command.Console = t.Slave.Name()
 
 	go func() {
-		defer pipes.Stdout.Close()
+		if wb, ok := pipes.Stdout.(interface {
+			CloseWriters() error
+		}); ok {
+			defer wb.CloseWriters()
+		}
 		io.Copy(pipes.Stdout, t.Master)
 	}()
 
diff --git a/utils/utils.go b/utils/utils.go
index 3a87f76f5f..1aba80ff41 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -388,7 +388,7 @@ func (w *WriteBroadcaster) Write(p []byte) (n int, err error) {
 	return len(p), nil
 }
 
-func (w *WriteBroadcaster) Close() error {
+func (w *WriteBroadcaster) CloseWriters() error {
 	w.Lock()
 	defer w.Unlock()
 	for sw := range w.writers {
diff --git a/utils/utils_test.go b/utils/utils_test.go
index f8b3920548..7e63a45cf7 100644
--- a/utils/utils_test.go
+++ b/utils/utils_test.go
@@ -110,7 +110,7 @@ func TestWriteBroadcaster(t *testing.T) {
 		t.Errorf("Buffer contains %v", bufferC.String())
 	}
 
-	writer.Close()
+	writer.CloseWriters()
 }
 
 type devNullCloser int