diff --git a/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp b/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp
index 8b1b5a88..9d20462d 100644
--- a/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp
+++ b/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp
@@ -319,7 +319,7 @@ TEST_F(WVDrmPluginTest, ClosesSessions) {
   ASSERT_EQ(Status::OK, status);
 }
 
-TEST_F(WVDrmPluginTest, ClosesSessionWithoutReturningError) {
+TEST_F(WVDrmPluginTest, ClosesSessionWithError) {
   android::sp<StrictMock<MockCDM>> cdm = new StrictMock<MockCDM>();
   StrictMock<MockCrypto> crypto;
   std::string appPackageName;
@@ -329,7 +329,7 @@ TEST_F(WVDrmPluginTest, ClosesSessionWithoutReturningError) {
 
   WVDrmPlugin plugin(cdm.get(), appPackageName, &crypto, false);
   Status status = plugin.closeSession(toHidlVec(sessionId));
-  ASSERT_EQ(Status::OK, status);
+  ASSERT_EQ(Status::ERROR_DRM_SESSION_NOT_OPENED, status);
 }
 
 // TODO b/35325611 Fix this disabled test
diff --git a/libwvdrmengine/mediadrm/test/legacy_src/WVDrmPlugin_test.cpp b/libwvdrmengine/mediadrm/test/legacy_src/WVDrmPlugin_test.cpp
index 286ec0d1..e00fbb82 100644
--- a/libwvdrmengine/mediadrm/test/legacy_src/WVDrmPlugin_test.cpp
+++ b/libwvdrmengine/mediadrm/test/legacy_src/WVDrmPlugin_test.cpp
@@ -227,7 +227,7 @@ TEST_F(WVDrmPluginTest, ClosesSessions) {
   ASSERT_EQ(OK, res);
 }
 
-TEST_F(WVDrmPluginTest, ClosesSessionWithoutReturningError) {
+TEST_F(WVDrmPluginTest, ClosesSessionWithError) {
   android::sp<StrictMock<MockCDM>> cdm = new StrictMock<MockCDM>();
   StrictMock<MockCrypto> crypto;
   WVDrmPlugin plugin(cdm.get(), &crypto);
@@ -237,7 +237,7 @@ TEST_F(WVDrmPluginTest, ClosesSessionWithoutReturningError) {
 
   status_t res = plugin.closeSession(sessionId);
 
-  ASSERT_EQ(OK, res);
+  ASSERT_EQ(ERROR_DRM_SESSION_NOT_OPENED, res);
 }
 
 TEST_F(WVDrmPluginTest, GeneratesKeyRequests) {