2 files changed, 7 insertions, 3 deletions
diff --git a/tensorflow/contrib/rnn/ops/gru_ops_test.cc b/tensorflow/contrib/rnn/ops/gru_ops_test.cc
index de6914fccb..5372e6ba2c 100644
--- a/tensorflow/contrib/rnn/ops/gru_ops_test.cc
+++ b/tensorflow/contrib/rnn/ops/gru_ops_test.cc
@@ -27,8 +27,10 @@ class GruOpsTest : public ::testing::Test {
     TF_Status* status = TF_NewStatus();
     auto* lib = TF_LoadLibrary(
         "tensorflow/contrib/rnn/python/ops/_gru_ops.so", status);
-    CHECK_EQ(TF_OK, TF_GetCode(status));
+    TF_Code code = TF_GetCode(status);
+    string status_msg(TF_Message(status));
     TF_DeleteStatus(status);
+    ASSERT_EQ(TF_OK, code) << status_msg;
     TF_DeleteLibraryHandle(lib);
   }
 };
diff --git a/tensorflow/contrib/rnn/ops/lstm_ops_test.cc b/tensorflow/contrib/rnn/ops/lstm_ops_test.cc
index a25e0674ea..7c4d003b83 100644
--- a/tensorflow/contrib/rnn/ops/lstm_ops_test.cc
+++ b/tensorflow/contrib/rnn/ops/lstm_ops_test.cc
@@ -29,9 +29,11 @@ class LSTMOpsTest : public ::testing::Test {
     TF_Status* status = TF_NewStatus();
     auto* lib = TF_LoadLibrary(
         "tensorflow/contrib/rnn/python/ops/_lstm_ops.so", status);
-    CHECK_EQ(TF_OK, TF_GetCode(status));
-    TF_DeleteLibraryHandle(lib);
+    TF_Code code = TF_GetCode(status);
+    string status_msg(TF_Message(status));
     TF_DeleteStatus(status);
+    ASSERT_EQ(TF_OK, code) << status_msg;
+    TF_DeleteLibraryHandle(lib);
   }
 };