diff --git a/test_infra/src/lib.rs b/test_infra/src/lib.rs
index 5e9178265..272d83cbf 100644
--- a/test_infra/src/lib.rs
+++ b/test_infra/src/lib.rs
@@ -832,30 +832,12 @@ impl Guest {
         )
     }
 
-    pub fn api_create_body(
-        &self,
-        cpu_count: u8,
-        _fw_path: &str,
-        _kernel_path: &str,
-        _kernel_cmd: &str,
-    ) -> String {
-        #[cfg(all(target_arch = "x86_64", not(feature = "mshv")))]
-        format! {"{{\"cpus\":{{\"boot_vcpus\":{},\"max_vcpus\":{}}},\"kernel\":{{\"path\":\"{}\"}},\"cmdline\":{{\"args\": \"\"}},\"net\":[{{\"ip\":\"{}\", \"mask\":\"255.255.255.0\", \"mac\":\"{}\"}}], \"disks\":[{{\"path\":\"{}\"}}, {{\"path\":\"{}\"}}]}}",
-                 cpu_count,
-                 cpu_count,
-                 _fw_path,
-                 self.network.host_ip,
-                 self.network.guest_mac,
-                 self.disk_config.disk(DiskType::OperatingSystem).unwrap().as_str(),
-                 self.disk_config.disk(DiskType::CloudInit).unwrap().as_str(),
-        }
-
-        #[cfg(any(target_arch = "aarch64", feature = "mshv"))]
+    pub fn api_create_body(&self, cpu_count: u8, kernel_path: &str, kernel_cmd: &str) -> String {
         format! {"{{\"cpus\":{{\"boot_vcpus\":{},\"max_vcpus\":{}}},\"kernel\":{{\"path\":\"{}\"}},\"cmdline\":{{\"args\": \"{}\"}},\"net\":[{{\"ip\":\"{}\", \"mask\":\"255.255.255.0\", \"mac\":\"{}\"}}], \"disks\":[{{\"path\":\"{}\"}}, {{\"path\":\"{}\"}}]}}",
                  cpu_count,
                  cpu_count,
-                 _kernel_path,
-                 _kernel_cmd,
+                 kernel_path,
+                 kernel_cmd,
                  self.network.host_ip,
                  self.network.guest_mac,
                  self.disk_config.disk(DiskType::OperatingSystem).unwrap().as_str(),
diff --git a/tests/integration.rs b/tests/integration.rs
index 4102662d8..cf02137da 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -4045,7 +4045,6 @@ mod parallel {
         let cpu_count: u8 = 4;
         let http_body = guest.api_create_body(
             cpu_count,
-            fw_path(FwType::RustHypervisorFirmware).as_str(),
             direct_kernel_boot_path().to_str().unwrap(),
             DIRECT_KERNEL_BOOT_CMDLINE,
         );
@@ -4099,7 +4098,6 @@ mod parallel {
         let cpu_count: u8 = 4;
         let http_body = guest.api_create_body(
             cpu_count,
-            fw_path(FwType::RustHypervisorFirmware).as_str(),
             direct_kernel_boot_path().to_str().unwrap(),
             DIRECT_KERNEL_BOOT_CMDLINE,
         );
@@ -4175,7 +4173,6 @@ mod parallel {
         let cpu_count: u8 = 4;
         let http_body = guest.api_create_body(
             cpu_count,
-            fw_path(FwType::RustHypervisorFirmware).as_str(),
             direct_kernel_boot_path().to_str().unwrap(),
             DIRECT_KERNEL_BOOT_CMDLINE,
         );
@@ -4259,7 +4256,6 @@ mod parallel {
         let cpu_count: u8 = 4;
         let http_body = guest.api_create_body(
             cpu_count,
-            fw_path(FwType::RustHypervisorFirmware).as_str(),
             direct_kernel_boot_path().to_str().unwrap(),
             DIRECT_KERNEL_BOOT_CMDLINE,
         );