diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index 794bf15013..e01fe18627 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -263,6 +263,14 @@ def _WipeOldOutput(buildroot):
   RunCommand(['rm', '-rf', 'src/build/images'], cwd=buildroot)
 
 
+def _EnableLocalAccount(buildroot):
+  cwd = os.path.join(buildroot, 'src', 'scripts')
+  # Set local account for test images.
+  RunCommand(['./enable_localaccount.sh',
+             'chronos'],
+             print_cmd=False, cwd=cwd)
+
+
 def _BuildImage(buildroot):
   _WipeOldOutput(buildroot)
 
@@ -415,6 +423,7 @@ def main():
     if buildconfig['uprev']:
       _UprevPackages(buildroot, revisionfile, board=buildconfig['board'])
 
+    _EnableLocalAccount(buildroot)
     _Build(buildroot)
     if buildconfig['unittests']:
       _RunUnitTests(buildroot)
diff --git a/bin/cbuildbot_config.py b/bin/cbuildbot_config.py
index dda1ef8a50..2e68b0e43f 100644
--- a/bin/cbuildbot_config.py
+++ b/bin/cbuildbot_config.py
@@ -48,7 +48,6 @@ config['x86_pineview_bin'] = {
   'important' : False,
   'hostname' : 'codf200.jail',
   'unittests': True,
-  'smoke_bvt' : True,
 }
 config['arm_tegra2_bin'] = {
   'board' : 'tegra2',