diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go
index d3c26d312..06a377e3e 100644
--- a/drivers/docker/driver.go
+++ b/drivers/docker/driver.go
@@ -1242,3 +1242,7 @@ func sliceMergeUlimit(ulimitsRaw map[string]string) ([]docker.ULimit, error) {
 	}
 	return ulimits, nil
 }
+
+func (d *Driver) Shutdown() {
+	d.signalShutdown()
+}
diff --git a/drivers/exec/driver.go b/drivers/exec/driver.go
index 9f8c764a0..c9f4a404c 100644
--- a/drivers/exec/driver.go
+++ b/drivers/exec/driver.go
@@ -143,9 +143,8 @@ func (d *Driver) SetConfig(cfg *base.Config) error {
 	return nil
 }
 
-func (d *Driver) Shutdown(ctx context.Context) error {
+func (d *Driver) Shutdown() {
 	d.signalShutdown()
-	return nil
 }
 
 func (d *Driver) TaskConfigSchema() (*hclspec.Spec, error) {
diff --git a/drivers/java/driver.go b/drivers/java/driver.go
index b36699b16..fb712600a 100644
--- a/drivers/java/driver.go
+++ b/drivers/java/driver.go
@@ -556,3 +556,7 @@ func GetAbsolutePath(bin string) (string, error) {
 
 	return filepath.EvalSymlinks(lp)
 }
+
+func (d *Driver) Shutdown() {
+	d.signalShutdown()
+}
diff --git a/drivers/lxc/driver.go b/drivers/lxc/driver.go
index 028c356da..8226cfbe0 100644
--- a/drivers/lxc/driver.go
+++ b/drivers/lxc/driver.go
@@ -216,9 +216,8 @@ func (d *Driver) SetConfig(cfg *base.Config) error {
 	return nil
 }
 
-func (d *Driver) Shutdown(ctx context.Context) error {
+func (d *Driver) Shutdown() {
 	d.signalShutdown()
-	return nil
 }
 
 func (d *Driver) TaskConfigSchema() (*hclspec.Spec, error) {
diff --git a/drivers/mock/driver.go b/drivers/mock/driver.go
index 07b7344a6..89af73c85 100644
--- a/drivers/mock/driver.go
+++ b/drivers/mock/driver.go
@@ -550,3 +550,7 @@ func (d *Driver) GetHandle(taskID string) *taskHandle {
 	h, _ := d.tasks.Get(taskID)
 	return h
 }
+
+func (d *Driver) Shutdown() {
+	d.signalShutdown()
+}
diff --git a/drivers/qemu/driver.go b/drivers/qemu/driver.go
index 8514ea4f7..275b26dd9 100644
--- a/drivers/qemu/driver.go
+++ b/drivers/qemu/driver.go
@@ -644,3 +644,7 @@ func sendQemuShutdown(logger hclog.Logger, monitorPath string, userPid int) erro
 	}
 	return err
 }
+
+func (d *Driver) Shutdown() {
+	d.signalShutdown()
+}
diff --git a/drivers/rawexec/driver.go b/drivers/rawexec/driver.go
index d0f9fe83f..fba3b39b7 100644
--- a/drivers/rawexec/driver.go
+++ b/drivers/rawexec/driver.go
@@ -189,9 +189,8 @@ func (d *Driver) SetConfig(cfg *base.Config) error {
 	return nil
 }
 
-func (d *Driver) Shutdown(ctx context.Context) error {
+func (d *Driver) Shutdown() {
 	d.signalShutdown()
-	return nil
 }
 
 func (d *Driver) TaskConfigSchema() (*hclspec.Spec, error) {
diff --git a/drivers/rkt/driver.go b/drivers/rkt/driver.go
index 189b54f47..fe4fbcccb 100644
--- a/drivers/rkt/driver.go
+++ b/drivers/rkt/driver.go
@@ -1054,3 +1054,7 @@ func (d *Driver) handleWait(ctx context.Context, handle *taskHandle, ch chan *dr
 	case ch <- result:
 	}
 }
+
+func (d *Driver) Shutdown() {
+	d.signalShutdown()
+}