diff --git a/builder/dockerfile/containerbackend.go b/builder/dockerfile/containerbackend.go
index 8b70c6289d..8a2a706911 100644
--- a/builder/dockerfile/containerbackend.go
+++ b/builder/dockerfile/containerbackend.go
@@ -45,7 +45,7 @@ var errCancelled = errors.New("build cancelled")
 // Run a container by ID
 func (c *containerManager) Run(ctx context.Context, cID string, stdout, stderr io.Writer) (err error) {
 	attached := make(chan struct{})
-	errCh := make(chan error)
+	errCh := make(chan error, 1)
 	go func() {
 		errCh <- c.backend.ContainerAttachRaw(cID, nil, stdout, stderr, true, attached)
 	}()
diff --git a/integration/plugin/logging/read_test.go b/integration/plugin/logging/read_test.go
index 028a488cdf..e84738a72e 100644
--- a/integration/plugin/logging/read_test.go
+++ b/integration/plugin/logging/read_test.go
@@ -73,7 +73,7 @@ func TestReadPluginNoRead(t *testing.T) {
 
 			buf := bytes.NewBuffer(nil)
 
-			errCh := make(chan error)
+			errCh := make(chan error, 1)
 			go func() {
 				_, err := stdcopy.StdCopy(buf, buf, logs)
 				errCh <- err