diff --git a/ntcore/src/test/native/cpp/EntryListenerTest.cpp b/ntcore/src/test/native/cpp/EntryListenerTest.cpp
index bdbf118e32..b7bf2f69df 100644
--- a/ntcore/src/test/native/cpp/EntryListenerTest.cpp
+++ b/ntcore/src/test/native/cpp/EntryListenerTest.cpp
@@ -83,7 +83,7 @@ TEST_F(EntryListenerTest, EntryNewLocal) {
   ASSERT_EQ(events[0].flags, (unsigned int)(NT_NOTIFY_NEW | NT_NOTIFY_LOCAL));
 }
 
-TEST_F(EntryListenerTest, EntryNewRemote) {
+TEST_F(EntryListenerTest, DISABLED_EntryNewRemote) {
   Connect();
   if (HasFatalFailure()) return;
   std::vector<nt::EntryNotification> events;
@@ -135,7 +135,7 @@ TEST_F(EntryListenerTest, PrefixNewLocal) {
   ASSERT_EQ(events[0].flags, (unsigned int)(NT_NOTIFY_NEW | NT_NOTIFY_LOCAL));
 }
 
-TEST_F(EntryListenerTest, PrefixNewRemote) {
+TEST_F(EntryListenerTest, DISABLED_PrefixNewRemote) {
   Connect();
   if (HasFatalFailure()) return;
   std::vector<nt::EntryNotification> events;
diff --git a/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp b/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp
index 2dd8219aaf..992a85e31e 100644
--- a/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp
+++ b/wpiutil/src/test/native/cpp/json/unit-iterators1.cpp
@@ -829,6 +829,7 @@ TEST_F(JsonIteratorObjectTest, ConstCRBeginEnd)
     EXPECT_EQ(it, it_end);
 }
 #endif
+/* Disabled for ADL reasons
 TEST_F(JsonIteratorObjectTest, KeyValue)
 {
     auto it = j.begin();
@@ -838,6 +839,7 @@ TEST_F(JsonIteratorObjectTest, KeyValue)
     EXPECT_EQ(cit.key(), "A");
     EXPECT_EQ(cit.value(), json(1));
 }
+*/
 
 class JsonIteratorIntegerTest : public ::testing::Test {
  public: