diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java
index 67cea8fcc25e2..5e8e6ddc1e26a 100644
--- a/src/java.base/share/classes/java/security/Provider.java
+++ b/src/java.base/share/classes/java/security/Provider.java
@@ -1321,7 +1321,13 @@ public Set<Service> getServices() {
                 set.addAll(serviceMap.values());
             }
             if (!legacyMap.isEmpty()) {
-                set.addAll(legacyMap.values());
+                legacyMap.entrySet().forEach(entry -> {
+                    if (!entry.getValue().isValid()) {
+                        legacyMap.remove(entry.getKey(), entry.getValue());
+                    } else {
+                        set.add(entry.getValue());
+                    }
+                });
             }
             serviceSet = Collections.unmodifiableSet(set);
             servicesChanged = false;
diff --git a/test/jdk/java/security/Provider/CaseSensitiveServices.java b/test/jdk/java/security/Provider/CaseSensitiveServices.java
index d9b8d315bd033..a5b39bde3af37 100644
--- a/test/jdk/java/security/Provider/CaseSensitiveServices.java
+++ b/test/jdk/java/security/Provider/CaseSensitiveServices.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 5097015 8130181 8279222
+ * @bug 5097015 8130181 8279222 8292739
  * @summary make sure we correctly treat Provider string entries as case insensitive
  * @author Andreas Sterbenz
  */
@@ -42,15 +42,23 @@ public class CaseSensitiveServices extends Provider {
         put("MESSAGEDIGEST.BAZ", "com.Baz");
         // reassign the DEF alias to algorithm Bar
         put("ALg.aliaS.MESSAGEdigest.DEF", "Bar");
+        // invalid entry since it misses the corresponding impl class info
+        // e.g. put("MessageDigest.Invalid", "implClass");
+        put("MessageDigest.Invalid xYz", "aBc");
     }
 
     public static void main(String[] args) throws Exception {
         Provider p = new CaseSensitiveServices();
-        System.out.println(p.getServices());
+
+        System.out.println("Services: " + p.getServices());
+
         if (p.getServices().size() != 3) {
             throw new Exception("services.size() should be 3");
         }
 
+        if (p.getService("MessageDigest", "Invalid") != null) {
+            throw new Exception("Invalid service returned");
+        }
         Service s = testService(p, "MessageDigest", "fOO");
         String val = s.getAttribute("Xyz");
         if ("aBc".equals(val) == false) {
@@ -70,7 +78,8 @@ public static void main(String[] args) throws Exception {
         System.out.println("OK");
     }
 
-    private static Service testService(Provider p, String type, String alg) throws Exception {
+    private static Service testService(Provider p, String type, String alg)
+            throws Exception {
         System.out.println("Getting " + type + "." + alg + "...");
         Service s = p.getService(type, alg);
         System.out.println(s);