diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go
index 9dbec8fb3..9491873ba 100644
--- a/client/driver/raw_exec.go
+++ b/client/driver/raw_exec.go
@@ -44,11 +44,6 @@ func (d *RawExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (boo
 	// Check that the user has explicitly enabled this executor.
 	enabled := cfg.ReadBoolDefault(rawExecConfigOption, false)
 
-	// Always turn this driver on in dev mode because we don't have a config file
-	if cfg.DevMode {
-		enabled = true
-	}
-
 	if enabled {
 		d.logger.Printf("[WARN] driver.raw_exec: raw exec is enabled. Only enable if needed")
 		node.Attributes["driver.raw_exec"] = "1"
diff --git a/command/agent/config.go b/command/agent/config.go
index e94ce2e4c..e3fb3ae17 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -257,6 +257,9 @@ func DevConfig() *Config {
 	} else if runtime.GOOS == "linux" {
 		conf.Client.NetworkInterface = "lo"
 	}
+	conf.Client.Options = map[string]string{
+		"driver.raw_exec.enable": "true",
+	}
 
 	return conf
 }