diff --git a/system/main/shim/acl.cc b/system/main/shim/acl.cc
index d11ad6e7735846a1ff8a9ed5fe1f6b9ab0f39d61..b44315227db6e8a71ba7921bd259f13ff15785be 100644
--- a/system/main/shim/acl.cc
+++ b/system/main/shim/acl.cc
@@ -1354,7 +1354,7 @@ void DumpsysNeighbor(int fd) {
   LOG_DUMPSYS(fd, "Last %zu inquiry scans:", copy.size());
   for (const auto& it : copy) {
     LOG_DUMPSYS(fd,
-                "  %s - %s duration_ms:%-5Lu num_resp:%-2u"
+                "  %s - %s duration_ms:%-5llu num_resp:%-2u"
                 " std:%-2u rssi:%-2u ext:%-2u %12s",
                 EpochMillisToString(it.entry.start_time_ms).c_str(),
                 EpochMillisToString(it.timestamp).c_str(),
diff --git a/system/main/test/main_shim_test.cc b/system/main/test/main_shim_test.cc
index bd324c803369a3d7fbb58532f19da5b2bcca5c07..fcaf32b4c50d3506f8531a07a28a22989c501a82 100644
--- a/system/main/test/main_shim_test.cc
+++ b/system/main/test/main_shim_test.cc
@@ -17,6 +17,7 @@
 #include <fcntl.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <unistd.h>
 
 #include <cstddef>
 #include <cstdio>
@@ -782,5 +783,26 @@ TEST_F(MainShimTest, ticks_to_seconds) {
 
 TEST_F(MainShimTest, DumpConnectionHistory) {
   auto acl = MakeAcl();
-  acl->DumpConnectionHistory(1);
+  acl->DumpConnectionHistory(STDOUT_FILENO);
+}
+
+void DumpsysNeighbor(int fd);
+TEST_F(MainShimTest, DumpsysNeighbor) {
+  btm_cb.neighbor = {};
+
+  btm_cb.neighbor.inquiry_history_->Push({
+      .status = tBTM_INQUIRY_CMPL::CANCELED,
+      .num_resp = 45,
+      .resp_type = {20, 30, 40},
+      .start_time_ms = 0,
+  });
+
+  btm_cb.neighbor.inquiry_history_->Push({
+      .status = tBTM_INQUIRY_CMPL::CANCELED,
+      .num_resp = 123,
+      .resp_type = {50, 60, 70},
+      .start_time_ms = -1,
+  });
+
+  DumpsysNeighbor(STDOUT_FILENO);
 }