diff --git a/src/meshUtils.cpp b/src/meshUtils.cpp
index 89c548887..f2ee20589 100644
--- a/src/meshUtils.cpp
+++ b/src/meshUtils.cpp
@@ -124,10 +124,10 @@ bool sanitizeUtf8(char *buf, size_t bufSize)
     if (!buf || bufSize == 0)
         return false;
 
-    // Ensure null-terminated within buffer
+    // Ensure null-terminated within buffer; report if we had to enforce it
+    bool replaced = (buf[bufSize - 1] != '\0');
     buf[bufSize - 1] = '\0';
 
-    bool replaced = false;
     size_t i = 0;
     size_t len = strlen(buf);
 
diff --git a/test/test_transmit_history/test_main.cpp b/test/test_transmit_history/test_main.cpp
index 3bd84b55c..c242aa646 100644
--- a/test/test_transmit_history/test_main.cpp
+++ b/test/test_transmit_history/test_main.cpp
@@ -303,6 +303,10 @@ void setup()
 {
     initializeTestEnvironment();
 
+    // Wait for portduino's millis() clock to start ticking before tests run
+    testDelay(10);
+    testDelay(2000);
+
     UNITY_BEGIN();
 
     RUN_TEST(test_setLastSentToMesh_stores_millis);
diff --git a/test/test_utf8/test_main.cpp b/test/test_utf8/test_main.cpp
index 7ac64653d..5a074e96e 100644
--- a/test/test_utf8/test_main.cpp
+++ b/test/test_utf8/test_main.cpp
@@ -163,7 +163,7 @@ void test_above_max_codepoint()
     TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
 }
 
-int main(int argc, char **argv)
+void setup()
 {
     UNITY_BEGIN();
 
@@ -191,5 +191,7 @@ int main(int argc, char **argv)
     RUN_TEST(test_valid_max_codepoint);
     RUN_TEST(test_above_max_codepoint);
 
-    return UNITY_END();
+    exit(UNITY_END());
 }
+
+void loop() {}
diff --git a/variants/native/portduino.ini b/variants/native/portduino.ini
index 87d8431a3..b276d2779 100644
--- a/variants/native/portduino.ini
+++ b/variants/native/portduino.ini
@@ -2,7 +2,7 @@
 [portduino_base]
 platform =
   # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/71ed55bb95feb3c43ebde1ec1e2e17643a424c04.zip
+  https://github.com/meshtastic/platform-native/archive/135b91e953db0b5f44d278f8ebd5b8d985fc03d8.zip
 framework = arduino
 
 build_src_filter =