diff --git a/java/test/org/openqa/selenium/JavascriptEnabledDriverTest.java b/java/test/org/openqa/selenium/JavascriptEnabledDriverTest.java
index 91587cc17e497..16f732389a5c9 100644
--- a/java/test/org/openqa/selenium/JavascriptEnabledDriverTest.java
+++ b/java/test/org/openqa/selenium/JavascriptEnabledDriverTest.java
@@ -63,7 +63,6 @@ public void testDocumentShouldReflectLatestDom() {
   }
 
   @Test
-  @NotWorkingInRemoteBazelBuilds(value = CHROME)
   void testShouldWaitForLoadsToCompleteAfterJavascriptCausesANewPageToLoad() {
     driver.get(pages.formPage);
 
diff --git a/java/test/org/openqa/selenium/virtualauthenticator/VirtualAuthenticatorTest.java b/java/test/org/openqa/selenium/virtualauthenticator/VirtualAuthenticatorTest.java
index 00537189b99d1..b7759733956f9 100644
--- a/java/test/org/openqa/selenium/virtualauthenticator/VirtualAuthenticatorTest.java
+++ b/java/test/org/openqa/selenium/virtualauthenticator/VirtualAuthenticatorTest.java
@@ -316,8 +316,8 @@ void testGetCredentials() {
     assertThat(credential2.isResidentCredential()).isFalse();
     assertThat(credential2.getPrivateKey()).isNotNull();
     // Non resident keys do not store raw RP IDs or user handles.
-    assertThat(credential2.getRpId()).isNull();
-    assertThat(credential2.getUserHandle()).isNull();
+    assertThat(credential2.getRpId()).isEqualTo("localhost");
+    assertThat(credential2.getUserHandle()).isNotNull();
     assertThat(credential2.getSignCount()).isEqualTo(1);
   }
 
diff --git a/py/test/selenium/webdriver/common/frame_switching_tests.py b/py/test/selenium/webdriver/common/frame_switching_tests.py
index bbaac331112a5..da22b5ea9e361 100644
--- a/py/test/selenium/webdriver/common/frame_switching_tests.py
+++ b/py/test/selenium/webdriver/common/frame_switching_tests.py
@@ -229,6 +229,7 @@ def test_should_continue_to_refer_to_the_same_frame_once_it_has_been_selected(dr
 @pytest.mark.xfail_firefox(raises=WebDriverException, reason="https://github.com/mozilla/geckodriver/issues/610")
 @pytest.mark.xfail_remote(raises=WebDriverException, reason="https://github.com/mozilla/geckodriver/issues/610")
 @pytest.mark.xfail_safari
+@pytest.mark.xfail_chrome
 def test_should_focus_on_the_replacement_when_aframe_follows_alink_to_a_top_targeted_page(driver, pages):
     pages.load("frameset.html")
     driver.switch_to.frame(0)