--- a/jdk/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java	Mon Jul 20 11:01:24 2015 -0700
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java	Tue Jul 21 10:28:32 2015 -0700
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests to send a not serializable notification.
- * @bug 5022196
+ * @bug 5022196 8132003
  * @author Shanliang JIANG
  * @modules java.management
  * @run clean NotSerializableNotifTest
@@ -53,22 +53,13 @@
     private static final MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
     private static ObjectName emitter;
 
-    private static String[] protocols;
+    private static String[] protocols = new String[] {"rmi", "iiop", "jmxmp"};
 
     private static final int sentNotifs = 10;
 
     public static void main(String[] args) throws Exception {
         System.out.println(">>> Test to send a not serializable notification");
 
-        // IIOP fails on JDK1.4, see 5034318
-        final String v = System.getProperty("java.version");
-        float f = Float.parseFloat(v.substring(0, 3));
-        if (f<1.5) {
-            protocols = new String[] {"rmi", "jmxmp"};
-        } else {
-            protocols = new String[] {"rmi", "iiop", "jmxmp"};
-        }
-
         emitter = new ObjectName("Default:name=NotificationEmitter");
         mbeanServer.registerMBean(new NotificationEmitter(), emitter);