diff --git a/llvm/unittests/CAS/OnDiskGraphDBTest.cpp b/llvm/unittests/CAS/OnDiskGraphDBTest.cpp
index 58f5dcc625a09..3c2e96318a5ed 100644
--- a/llvm/unittests/CAS/OnDiskGraphDBTest.cpp
+++ b/llvm/unittests/CAS/OnDiskGraphDBTest.cpp
@@ -283,7 +283,7 @@ TEST_F(OnDiskCASTest, OnDiskGraphDBFaultInPolicyConflict) {
                            OnDiskGraphDB::FaultInPolicy::SingleNode);
 }
 
-#if defined(EXPENSIVE_CHECKS)
+#if defined(EXPENSIVE_CHECKS) && !defined(_WIN32)
 TEST_F(OnDiskCASTest, OnDiskGraphDBSpaceLimit) {
   setMaxOnDiskCASMappingSize();
   unittest::TempDir Temp("ondiskcas", /*Unique=*/true);
diff --git a/llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp b/llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp
index 89c03b890a488..19ea8f5d30b71 100644
--- a/llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp
+++ b/llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp
@@ -33,13 +33,13 @@ TEST_F(OnDiskCASTest, OnDiskKeyValueDBTest) {
   }
 
   ValueType ValW = valueFromString("world");
-  ArrayRef<char> Val;
+  std::optional<ArrayRef<char>> Val;
   ASSERT_THAT_ERROR(DB->put(digest("hello"), ValW).moveInto(Val), Succeeded());
-  EXPECT_EQ(Val, ArrayRef(ValW));
+  EXPECT_EQ(*Val, ArrayRef(ValW));
   ASSERT_THAT_ERROR(
       DB->put(digest("hello"), valueFromString("other")).moveInto(Val),
       Succeeded());
-  EXPECT_EQ(Val, ArrayRef(ValW));
+  EXPECT_EQ(*Val, ArrayRef(ValW));
 
   {
     std::optional<ArrayRef<char>> Val;