Index: src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java
===================================================================
--- src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java	(revision 1415698)
+++ src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeTest.java	(working copy)
@@ -20,6 +20,7 @@
 
 import javax.jcr.Node;
 import javax.jcr.Session;
+import javax.jcr.ValueFactory;
 import javax.jcr.nodetype.ConstraintViolationException;
 
 import org.apache.jackrabbit.oak.jcr.AbstractRepositoryTest;
@@ -38,4 +39,21 @@
         root.addNode("q1", "nt:query").addNode("q2", "nt:query");
         session.save();
     }
+
+    @Test(expected = ConstraintViolationException.class)
+    public void illegalAddNodeWithProps() throws Exception {
+        Session session = getAdminSession();
+        Node root = session.getRootNode();
+        ValueFactory vf = session.getValueFactory();
+
+        Node n = root.addNode("q1", "nt:query");
+        n.setProperty("jcr:statement", vf.createValue("statement"));
+        n.setProperty("jcr:language", vf.createValue("language"));
+
+        Node n2 = n.addNode("q2", "nt:query");
+        n2.setProperty("jcr:statement", vf.createValue("statement"));
+        n2.setProperty("jcr:language", vf.createValue("language"));
+
+        session.save();
+    }
 }