--- a/test/jdk/java/util/Optional/Basic.java	Wed Mar 28 10:01:52 2018 -0700
+++ b/test/jdk/java/util/Optional/Basic.java	Wed Mar 28 11:06:28 2018 -0700
@@ -183,6 +183,7 @@
                      "plugh");
     }
 
+/*
     @Test
     public void testOrEmptyEmpty() {
         checkEmpty(Optional.<String>empty().or(() -> Optional.empty()));
@@ -197,6 +198,7 @@
     public void testOrPresentDontCare() {
         checkPresent(Optional.of("xyzzy").or(() -> { fail(); return Optional.of("plugh"); }), "xyzzy");
     }
+*/
 
     @Test
     public void testStreamEmpty() {