diff --git a/gin/converter_unittest.cc b/gin/converter_unittest.cc
index 2c404627040d82..4b0cc647f396b4 100644
--- a/gin/converter_unittest.cc
+++ b/gin/converter_unittest.cc
@@ -139,9 +139,12 @@ TEST_F(ConverterTest, Vector) {
       Converter<std::vector<int>>::ToV8(instance_->isolate(), expected)
           .As<Array>();
   EXPECT_EQ(3u, js_array->Length());
+  v8::Local<v8::Context> context = instance_->isolate()->GetCurrentContext();
   for (size_t i = 0; i < expected.size(); ++i) {
-    EXPECT_TRUE(Integer::New(instance_->isolate(), expected[i])
-                    ->StrictEquals(js_array->Get(static_cast<int>(i))));
+    EXPECT_TRUE(
+        Integer::New(instance_->isolate(), expected[i])
+            ->StrictEquals(
+                js_array->Get(context, static_cast<int>(i)).ToLocalChecked()));
   }
 }
 
diff --git a/gin/shell_runner_unittest.cc b/gin/shell_runner_unittest.cc
index 8c0873ac058ab1..9e277e29b47e5a 100644
--- a/gin/shell_runner_unittest.cc
+++ b/gin/shell_runner_unittest.cc
@@ -45,8 +45,11 @@ TEST(RunnerTest, Run) {
   runner.Run(source, "test_data.js");
 
   std::string result;
-  EXPECT_TRUE(Converter<std::string>::FromV8(isolate,
-      runner.global()->Get(StringToV8(isolate, "result")),
+  EXPECT_TRUE(Converter<std::string>::FromV8(
+      isolate,
+      runner.global()
+          ->Get(isolate->GetCurrentContext(), StringToV8(isolate, "result"))
+          .ToLocalChecked(),
       &result));
   EXPECT_EQ("PASS", result);
 }