diff --git a/lib/robot.js b/lib/robot.js
index 3147ab9..2699781 100644
--- a/lib/robot.js
+++ b/lib/robot.js
@@ -120,9 +120,9 @@ var Robot = module.exports = function Robot(opts) {
     this.commands = opts.commands;
   }
 
-  var mode = Utils.fetch(Config, 'mode', 'auto_start');
+  var mode = Utils.fetch(Config, 'mode', 'auto');
 
-  if (mode === 'auto_start') {
+  if (mode === 'auto') {
     // run on the next tick, to allow for 'work' event handlers to be set up
     setTimeout(this.start, 0);
   }
diff --git a/test/support/env.js b/test/support/env.js
index 014e587..15d5f12 100644
--- a/test/support/env.js
+++ b/test/support/env.js
@@ -29,7 +29,7 @@ global.source = function(module) {
 var Cylon = source('cylon');
 
 Cylon.config({
-  auto_start: false
+  mode: "manual"
 });
 
 Cylon.Logger.setup(false);