diff --git a/unittests/DebugInfo/CodeView/RandomAccessVisitorTest.cpp b/unittests/DebugInfo/CodeView/RandomAccessVisitorTest.cpp
index 1c68bf3bc9b..fedb5978da8 100644
--- a/unittests/DebugInfo/CodeView/RandomAccessVisitorTest.cpp
+++ b/unittests/DebugInfo/CodeView/RandomAccessVisitorTest.cpp
@@ -229,12 +229,12 @@ TEST_F(RandomAccessVisitorTest, MultipleVisits) {
   }
 
   // [0,8) should be present
-  EXPECT_EQ(8, Visitor.database().size());
+  EXPECT_EQ(8u, Visitor.database().size());
   for (uint32_t I = 0; I < 8; ++I)
     EXPECT_TRUE(ValidateDatabaseRecord(Visitor, I));
 
   // 5, 5, 5
-  EXPECT_EQ(3, TestState->Callbacks.count());
+  EXPECT_EQ(3u, TestState->Callbacks.count());
   for (auto I : enumerate(IndicesToVisit))
     EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
 }
@@ -257,12 +257,12 @@ TEST_F(RandomAccessVisitorTest, DescendingWithinChunk) {
   }
 
   // [0, 7]
-  EXPECT_EQ(8, Visitor.database().size());
+  EXPECT_EQ(8u, Visitor.database().size());
   for (uint32_t I = 0; I < 8; ++I)
     EXPECT_TRUE(ValidateDatabaseRecord(Visitor, I));
 
   // 2, 4, 7
-  EXPECT_EQ(3, TestState->Callbacks.count());
+  EXPECT_EQ(3u, TestState->Callbacks.count());
   for (auto I : enumerate(IndicesToVisit))
     EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
 }
@@ -285,12 +285,12 @@ TEST_F(RandomAccessVisitorTest, AscendingWithinChunk) {
   }
 
   // [0, 7]
-  EXPECT_EQ(8, Visitor.database().size());
+  EXPECT_EQ(8u, Visitor.database().size());
   for (uint32_t I = 0; I < 8; ++I)
     EXPECT_TRUE(ValidateDatabaseRecord(Visitor, I));
 
   // 2, 4, 7
-  EXPECT_EQ(3, TestState->Callbacks.count());
+  EXPECT_EQ(3u, TestState->Callbacks.count());
   for (auto &I : enumerate(IndicesToVisit))
     EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
 }
@@ -314,12 +314,12 @@ TEST_F(RandomAccessVisitorTest, StopPrematurelyInChunk) {
   }
 
   // [0, 8) should be visited.
-  EXPECT_EQ(8, Visitor.database().size());
+  EXPECT_EQ(8u, Visitor.database().size());
   for (uint32_t I = 0; I < 8; ++I)
     EXPECT_TRUE(ValidateDatabaseRecord(Visitor, I));
 
   // [0, 2]
-  EXPECT_EQ(3, TestState->Callbacks.count());
+  EXPECT_EQ(3u, TestState->Callbacks.count());
   for (auto I : enumerate(IndicesToVisit))
     EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
 }
@@ -342,12 +342,12 @@ TEST_F(RandomAccessVisitorTest, InnerChunk) {
   }
 
   // [4, 9)
-  EXPECT_EQ(5, Visitor.database().size());
+  EXPECT_EQ(5u, Visitor.database().size());
   for (uint32_t I = 4; I < 9; ++I)
     EXPECT_TRUE(ValidateDatabaseRecord(Visitor, I));
 
   // 5, 7
-  EXPECT_EQ(2, TestState->Callbacks.count());
+  EXPECT_EQ(2u, TestState->Callbacks.count());
   for (auto &I : enumerate(IndicesToVisit))
     EXPECT_TRUE(ValidateVisitedRecord(I.index(), I.value()));
 }