diff --git a/tower-batch/src/service.rs b/tower-batch/src/service.rs
index 65b128a7..bbe1e582 100644
--- a/tower-batch/src/service.rs
+++ b/tower-batch/src/service.rs
@@ -85,8 +85,8 @@ where
         let semaphore = Semaphore::new(bound);
         Batch {
             tx,
-            handle,
             semaphore,
+            handle,
         }
     }
 
@@ -140,8 +140,8 @@ where
 
         match self.tx.send(Message {
             request,
-            span,
             tx,
+            span,
             _permit,
         }) {
             Err(_) => ResponseFuture::failed(self.get_worker_error()),
diff --git a/zebra-network/src/peer/client.rs b/zebra-network/src/peer/client.rs
index d3a5640e..264fa26c 100644
--- a/zebra-network/src/peer/client.rs
+++ b/zebra-network/src/peer/client.rs
@@ -218,7 +218,7 @@ impl Service<Request> for Client {
         // request.
         let span = tracing::Span::current();
 
-        match self.server_tx.try_send(ClientRequest { request, span, tx }) {
+        match self.server_tx.try_send(ClientRequest { request, tx, span }) {
             Err(e) => {
                 if e.is_disconnected() {
                     let ClientRequest { tx, .. } = e.into_inner();
diff --git a/zebra-test/src/command.rs b/zebra-test/src/command.rs
index 119272f4..bf5d3625 100644
--- a/zebra-test/src/command.rs
+++ b/zebra-test/src/command.rs
@@ -51,7 +51,7 @@ impl CommandExt for Command {
             .wrap_err("failed to execute process")
             .with_section(command)?;
 
-        Ok(TestStatus { status, cmd })
+        Ok(TestStatus { cmd, status })
     }
 
     /// wrapper for `output` fn on `Command` that constructs informative error