diff --git a/client/driver/exec.go b/client/driver/exec.go
index e1fdb1646..4da628879 100644
--- a/client/driver/exec.go
+++ b/client/driver/exec.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"path/filepath"
-	"runtime"
 	"syscall"
 	"time"
 
@@ -13,7 +12,6 @@ import (
 	"github.com/hashicorp/nomad/client/config"
 	"github.com/hashicorp/nomad/client/driver/executor"
 	cstructs "github.com/hashicorp/nomad/client/driver/structs"
-	"github.com/hashicorp/nomad/client/fingerprint"
 	"github.com/hashicorp/nomad/client/getter"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/mitchellh/mapstructure"
@@ -23,8 +21,8 @@ import (
 // features.
 type ExecDriver struct {
 	DriverContext
-	fingerprint.StaticFingerprinter
 }
+
 type ExecDriverConfig struct {
 	ArtifactSource string   `mapstructure:"artifact_source"`
 	Checksum       string   `mapstructure:"checksum"`
@@ -47,9 +45,9 @@ func NewExecDriver(ctx *DriverContext) Driver {
 }
 
 func (d *ExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) {
-	// Only enable if we are root on linux.
-	if runtime.GOOS != "linux" {
-		d.logger.Printf("[DEBUG] driver.exec: only available on linux, disabling")
+	// Only enable if cgroups are available and we are root
+	if _, ok := node.Attributes["cgroup.mountpoint"]; !ok {
+		d.logger.Printf("[DEBUG] driver.exec: cgroups unavailable, disabling")
 		return false, nil
 	} else if syscall.Geteuid() != 0 {
 		d.logger.Printf("[DEBUG] driver.exec: must run as root user, disabling")
@@ -60,6 +58,10 @@ func (d *ExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool,
 	return true, nil
 }
 
+func (d *ExecDriver) Periodic() (bool, time.Duration) {
+	return true, 15 * time.Second
+}
+
 func (d *ExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, error) {
 	var driverConfig ExecDriverConfig
 	if err := mapstructure.WeakDecode(task.Config, &driverConfig); err != nil {
diff --git a/client/driver/exec_test.go b/client/driver/exec_test.go
index 9c6cf8649..04d8dca89 100644
--- a/client/driver/exec_test.go
+++ b/client/driver/exec_test.go
@@ -22,7 +22,9 @@ func TestExecDriver_Fingerprint(t *testing.T) {
 	driverCtx, _ := testDriverContexts(&structs.Task{Name: "foo"})
 	d := NewExecDriver(driverCtx)
 	node := &structs.Node{
-		Attributes: make(map[string]string),
+		Attributes: map[string]string{
+			"cgroup.mountpoint": "/sys/fs/cgroup",
+		},
 	}
 	apply, err := d.Fingerprint(&config.Config{}, node)
 	if err != nil {