diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 5e5a690..83948e0 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -1123,6 +1123,14 @@
                 "text/html", "UTF-8", null);
         waitForLoadComplete();
         assertEquals(crossOriginUrl, mWebView.getTitle());
+
+        // Check that when the base URL uses the 'data' scheme, a 'data' scheme URL is used and the
+        // history URL is ignored.
+        mWebView.loadDataWithBaseURL("data:foo", "<html><body>bar</body></html>",
+                "text/html", "UTF-8", historyUrl);
+        waitForLoadComplete();
+        assertTrue(mWebView.getUrl().indexOf("data:text/html,") == 0);
+        assertTrue(mWebView.getUrl().indexOf("bar") > 0);
     }
 
     @TestTargetNew(