diff --git a/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
index cb27fa93fd8d2f101f232363c289f0bf44e54832..f4cdfdb688aeb90714781649d106b64ec6b3e616 100644
--- a/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+++ b/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
@@ -121,7 +121,7 @@ public class TCPTransport extends Transport {
 
     private static final boolean disableIncomingHttp =
         java.security.AccessController.doPrivileged(
-            new GetPropertyAction("java.rmi.server.disableIncomingHttp", "true"))
+            new GetPropertyAction("sun.rmi.server.disableIncomingHttp", "true"))
                 .equalsIgnoreCase("true");
 
     /** total connections handled */
diff --git a/test/sun/rmi/transport/proxy/EagerHttpFallback.java b/test/sun/rmi/transport/proxy/EagerHttpFallback.java
index 7e1507613adb9e364caf8d069b06dcf4a8e77c45..70f9d714cf2ab6490e5b3d3ebbc2993deef86797 100644
--- a/test/sun/rmi/transport/proxy/EagerHttpFallback.java
+++ b/test/sun/rmi/transport/proxy/EagerHttpFallback.java
@@ -28,7 +28,7 @@
  *
  * @library ../../../../java/rmi/testlibrary
  * @build TestLibrary
- * @run main/othervm -Djava.rmi.server.disableIncomingHttp=false EagerHttpFallback
+ * @run main/othervm -Dsun.rmi.server.disableIncomingHttp=false EagerHttpFallback
  */
 
 import java.rmi.*;
@@ -46,8 +46,6 @@ public class EagerHttpFallback {
                            "true");
         LocateRegistry.createRegistry(FALLBACK_PORT);
 
-        System.err.println("1-DISABLED: " + System.getProperty("java.rmi.server.disableIncomingHttp"));
-
         /*
          * The call below should trigger a ConnectException in the
          * RMIMasterSocketFactory when it attempts a direct connection to
diff --git a/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java b/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java
index 35184d79a6f10b0324926e196b7baccfe2a9ed70..2f5761f8cdaeb682f02325cd1a95591daca4bb4a 100644
--- a/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java
+++ b/test/sun/rmi/transport/tcp/DisableRMIOverHttp/DisableRMIOverHTTPTest.java
@@ -29,7 +29,7 @@
  * @library ../../../../../java/rmi/testlibrary
  * @build TestIface TestImpl
  * @run main/othervm/timeout=60 DisableRMIOverHTTPTest
- * @run main/othervm/timeout=60 -Djava.rmi.server.disableIncomingHttp=false DisableRMIOverHTTPTest
+ * @run main/othervm/timeout=60 -Dsun.rmi.server.disableIncomingHttp=false DisableRMIOverHTTPTest
  */
 
 /*
@@ -60,7 +60,7 @@ public class DisableRMIOverHTTPTest
         boolean incomingHttpDisabled =
                 Boolean.valueOf(
                     System.getProperty(
-                            "java.rmi.server.disableIncomingHttp", "true")
+                            "sun.rmi.server.disableIncomingHttp", "true")
                         .equalsIgnoreCase("true"));
 
         // Set the socket factory.
diff --git a/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java b/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
index 95da5864fc217bdaf4bd33f5b369041a8c0b2b56..92399dd08df96df964ef6916e5831654c61e5f6f 100644
--- a/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
+++ b/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
@@ -29,7 +29,7 @@
  *
  * @library ../../../../../java/rmi/testlibrary
  * @build TestIface TestImpl TestImpl_Stub
- * @run main/othervm/policy=security.policy/timeout=60 -Djava.rmi.server.disableIncomingHttp=false BlockAcceptTest
+ * @run main/othervm/policy=security.policy/timeout=60 -Dsun.rmi.server.disableIncomingHttp=false BlockAcceptTest
  */
 
 /* This test attempts to stymie the RMI accept loop.  The accept loop in