merge in master

crates/forge/bin/cmd/test/mod.rs

@@ -502,8 +502,20 @@ impl TestArgs {
             runner.decode_internal = InternalTraceMode::Full;
         }
 
+        // Run tests in a non-streaming fashion and collect results for serialization.
         if !self.gas_report && self.json {
-            let results = runner.test_collect(filter);
+            let mut results = runner.test_collect(filter);
+            results.values_mut().for_each(|suite_result| {
+                for test_result in suite_result.test_results.values_mut() {
+                    if verbosity >= 2 {
+                        // Decode logs at level 2 and above.
+                        test_result.decoded_logs = decode_console_logs(&test_result.logs);
+                    } else {
+                        // Empty logs for non verbose runs.
+                        test_result.logs = vec![];
+                    }
+                }
+            });
             println!("{}", serde_json::to_string(&results)?);
             return Ok(TestOutcome::new(results, self.allow_failure));
         }