--- /dev/null	2015-07-27 12:59:03.558602608 +0400
+++ new/test/java/beans/Introspector/8132566/CBase.java	2015-08-04 16:56:40.282921334 +0400
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.beans.BeanProperty;
+import java.beans.PropertyChangeListener;
+
+
+public class CBase {
+
+    private int value;
+
+    @BeanProperty(
+            bound        = true,
+            expert       = true,
+            hidden       = true,
+            preferred    = true,
+            required     = true,
+            visualUpdate = true,
+            description  = "BASE",
+            enumerationValues = {"javax.swing.SwingConstants.TOP"}
+            )
+    public void setValue(int v) { value = v; }
+    public  int getValue()      { return value; }
+
+    public void addPropertyChangeListener(PropertyChangeListener l)    {}
+    public void removePropertyChangeListener(PropertyChangeListener l) {}
+}
--- /dev/null	2015-07-27 12:59:03.558602608 +0400
+++ new/test/java/beans/Introspector/8132566/Checker.java	2015-08-04 16:56:40.766921312 +0400
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Arrays;
+
+public class Checker {
+
+    static void checkEq(String what, Object v, Object ref) throws Exception {
+        if ((v != null) && v.equals(ref)) {
+            System.out.println(what + ": ok (" + ref.toString() + ")");
+        } else { throw new Exception(
+                "invalid " + what + ", expected: \"" + ref + "\", got: \"" + v + "\"");
+        }
+    }
+
+    static void checkEnumEq(String what, Object v, Object ref[]) throws Exception {
+        if (v == null) { throw new Exception("null " + what); }
+        if (!(v instanceof Object[])) { throw new Exception("invalid " + what); }
+        if (Arrays.equals((Object []) v, ref)) { System.out.println(what + ": ok"); }
+        else { throw new Exception("invalid " + what); }
+    }
+}
--- /dev/null	2015-07-27 12:59:03.558602608 +0400
+++ new/test/java/beans/Introspector/8132566/InheritPropertyInfoTest.java	2015-08-04 16:56:41.250921290 +0400
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+
+/**
+ * @test
+ * @bug 8132566 8131939
+ * @summary Check if the derived class inherits the property info
+ *          from the base class.
+ * @author a.stepanov
+ */
+
+public class InheritPropertyInfoTest {
+
+    public static class C extends CBase {}
+
+    public static void main(String[] args) throws Exception {
+
+        BeanInfo i = Introspector.getBeanInfo(C.class, Object.class);
+        PropertyDescriptor[] pds = i.getPropertyDescriptors();
+
+        Checker.checkEq("number of properties", pds.length, 1);
+        PropertyDescriptor p = pds[0];
+
+        Checker.checkEq("property description", p.getShortDescription(), "BASE");
+
+        Checker.checkEq("isBound",  p.isBound(),  true);
+        Checker.checkEq("isExpert", p.isExpert(), true);
+        Checker.checkEq("isHidden", p.isHidden(), true);
+        Checker.checkEq("isPreferred", p.isPreferred(), true);
+        Checker.checkEq("required", p.getValue("required"), true);
+        Checker.checkEq("visualUpdate", p.getValue("visualUpdate"), true);
+
+        Checker.checkEnumEq("enumerationValues", p.getValue("enumerationValues"),
+            new Object[]{"TOP", 1, "javax.swing.SwingConstants.TOP"});
+    }
+}
--- /dev/null	2015-07-27 12:59:03.558602608 +0400
+++ new/test/java/beans/Introspector/8132566/OverridePropertyInfoTest.java	2015-08-04 16:56:41.738921269 +0400
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.beans.BeanInfo;
+import java.beans.BeanProperty;
+import java.beans.Introspector;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyDescriptor;
+
+/**
+ * @test
+ * @bug 8132566 8132565 8131939
+ * @summary Check if the derived class overrides
+ *           the parent's property info.
+ * @author a.stepanov
+ */
+
+public class OverridePropertyInfoTest {
+
+    public static class C extends CBase {
+
+        private int value;
+
+        @BeanProperty(
+                bound        = false,
+                expert       = false,
+                hidden       = false,
+                preferred    = false,
+                required     = false,
+                visualUpdate = false,
+                description = "CHILD",
+                enumerationValues = {"javax.swing.SwingConstants.BOTTOM"}
+                )
+        @Override
+        public void setValue(int v) { value = v; }
+        @Override
+        public  int getValue() { return value; }
+
+        @Override
+        public void addPropertyChangeListener(PropertyChangeListener l)    {}
+        @Override
+        public void removePropertyChangeListener(PropertyChangeListener l) {}
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        BeanInfo i = Introspector.getBeanInfo(C.class, Object.class);
+        PropertyDescriptor[] pds = i.getPropertyDescriptors();
+
+        Checker.checkEq("number of properties", pds.length, 1);
+        PropertyDescriptor p = pds[0];
+        Checker.checkEq("property description", p.getShortDescription(), "CHILD");
+
+        Checker.checkEq("isBound",  p.isBound(),  false);
+        Checker.checkEq("isExpert", p.isExpert(), false);
+        Checker.checkEq("isHidden", p.isHidden(), false);
+        Checker.checkEq("isPreferred", p.isPreferred(), false);
+        Checker.checkEq("required", p.getValue("required"), false);
+        Checker.checkEq("visualUpdate", p.getValue("visualUpdate"), false);
+
+        Checker.checkEnumEq("enumerationValues", p.getValue("enumerationValues"),
+            new Object[]{"BOTTOM", 3, "javax.swing.SwingConstants.BOTTOM"});
+    }
+}