diff --git a/platformio/unittest/runners/base.py b/platformio/unittest/runners/base.py
index adce230c..508b5a79 100644
--- a/platformio/unittest/runners/base.py
+++ b/platformio/unittest/runners/base.py
@@ -88,7 +88,8 @@ class TestRunnerBase(TestRunnerNativeMixin, TestRunnerEmbeddedMixin):
             for stage in ("build", "upload", "run"):
                 getattr(self, f"stage_{stage}")()
         except Exception as exc:  # pylint: disable=broad-except
-            click.secho(str(exc), fg="red", err=True)
+            if str(exc) != "1":  # from returncode
+                click.secho(str(exc), fg="red", err=True)
             self.test_suite.on_error(exc)
         finally:
             self.test_suite.on_finish()
diff --git a/platformio/unittest/runners/unity.py b/platformio/unittest/runners/unity.py
index 663357b3..264948f0 100644
--- a/platformio/unittest/runners/unity.py
+++ b/platformio/unittest/runners/unity.py
@@ -56,7 +56,7 @@ void unityOutputChar(unsigned int);
 void unityOutputFlush();
 void unityOutputComplete();
 
-#define UNITY_OUTPUT_START()    unityOutputStart($baudrate)
+#define UNITY_OUTPUT_START()    unityOutputStart((unsigned int) $baudrate)
 #define UNITY_OUTPUT_CHAR(a)    unityOutputChar(a)
 #define UNITY_OUTPUT_FLUSH()    unityOutputFlush()
 #define UNITY_OUTPUT_COMPLETE() unityOutputComplete()
@@ -182,7 +182,9 @@ void unityOutputComplete(void) { unittest_uart_end(); }
         if not self.platform.is_embedded():
             return self.UNITY_FRAMEWORK_CONFIG["native"]
         if (
-            self.project_config.get(f"env:{self.test_suite.env_name}", "test_transport")
+            self.project_config.get(
+                f"env:{self.test_suite.env_name}", "test_transport", None
+            )
             == "custom"
         ):
             framework = "legacy_custom_transport"