diff --git a/test/tools/javap/T6587786.java b/test/tools/javap/T6587786.java
index 1b4fd2a76f5f2717c6e84f3fca13c1fda5f7a952..59845698b396606ce38c1554ea9734bb6ac4a043 100644
--- a/test/tools/javap/T6587786.java
+++ b/test/tools/javap/T6587786.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,8 @@
  */
 
 /*
+ * @ignore  until JDK-8195589 is fixed
+ *
  * @test
  * @bug 6587786
  * @summary Javap throws error : "ERROR:Could not find <classname>" for JRE classes