diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index a698f03..c3444d2 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -27,12 +27,10 @@
 """
 
 args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
 
 def run_corruptbothfwbodyab(machine):
-    host = hosts.create_host(machine, servo_host=servo_host,
-                             servo_port=servo_port)
+    host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptBothFwBodyAB", host=host, cmdline_args=args,
                  use_faft=True, disable_sysinfo=True,
                  dev_mode=True, tag="dev")