diff --git a/llvm/unittests/IR/VPIntrinsicTest.cpp b/llvm/unittests/IR/VPIntrinsicTest.cpp
index 963b1a8d7bce7..8d1f78daada4e 100644
--- a/llvm/unittests/IR/VPIntrinsicTest.cpp
+++ b/llvm/unittests/IR/VPIntrinsicTest.cpp
@@ -162,7 +162,7 @@ TEST_F(VPIntrinsicTest, VPIntrinsicsDefScopes) {
 #define END_REGISTER_VP_INTRINSIC(VPID)                                        \
   ASSERT_TRUE(ScopeVPID.has_value());                                          \
   ASSERT_EQ(ScopeVPID.value(), Intrinsic::VPID);                               \
-  ScopeVPID = None;
+  ScopeVPID = std::nullopt;
 
   Optional<ISD::NodeType> ScopeOPC;
 #define BEGIN_REGISTER_VP_SDNODE(SDOPC, ...)                                   \
@@ -171,7 +171,7 @@ TEST_F(VPIntrinsicTest, VPIntrinsicsDefScopes) {
 #define END_REGISTER_VP_SDNODE(SDOPC)                                          \
   ASSERT_TRUE(ScopeOPC.has_value());                                           \
   ASSERT_EQ(ScopeOPC.value(), ISD::SDOPC);                                     \
-  ScopeOPC = None;
+  ScopeOPC = std::nullopt;
 #include "llvm/IR/VPIntrinsics.def"
 
   ASSERT_FALSE(ScopeVPID.has_value());