diff --git a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
index 2998715e3c8..7f65c0eed9c 100644
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
@@ -462,7 +462,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable {
      * <code>false</code> that it is not. The default is <code>true</code>.
      * @serial
      */
-    private boolean escapeProcessing;
+    private boolean escapeProcessing = true;
 
     /**
      * A constant indicating the isolation level of the connection
diff --git a/jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java b/jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java
index e1b5457bda8..8e92f20af33 100644
--- a/jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java
+++ b/jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java
@@ -186,11 +186,11 @@ public class BaseRowSetTests extends BaseTest {
     }
 
     /*
-     * Validate that getEscapeProcessing() returns false by default
+     * Validate that getEscapeProcessing() returns true by default
      */
     @Test
     public void test08() throws Exception {
-        assertFalse(brs.getEscapeProcessing());
+        assertTrue(brs.getEscapeProcessing());
     }
 
     /*