diff --git a/fixtures/05_Reading/encoding.xml b/fixtures/05_Reading/encoding.xml
index cffc0ee6..1de1b399 100644
--- a/fixtures/05_Reading/encoding.xml
+++ b/fixtures/05_Reading/encoding.xml
@@ -58,5 +58,15 @@
                 <sv:value>nt:unstructured</sv:value>
             </sv:property>
         </sv:node>
+        <sv:node sv:name="node?">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+                <sv:value>nt:unstructured</sv:value>
+            </sv:property>
+        </sv:node>
+        <sv:node sv:name="node-¢">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+                <sv:value>nt:unstructured</sv:value>
+            </sv:property>
+        </sv:node>
     </sv:node>
 </sv:node>
diff --git a/fixtures/general/base.xml b/fixtures/general/base.xml
index 9da9e31e..a8630964 100644
--- a/fixtures/general/base.xml
+++ b/fixtures/general/base.xml
@@ -43,6 +43,12 @@
             <sv:property sv:name="jcr:data" sv:type="Binary">
                 <sv:value>aDEuIENoYXB0ZXIgMSBUaXRsZQoKKiBmb28KKiBiYXIKKiogZm9vMgoqKiBmb28zCiogZm9vMAoKfHwgaGVhZGVyIHx8IGJhciB8fAp8IGggfCBqIHwKCntjb2RlfQpoZWxsbyB3b3JsZAp7Y29kZX0KCiMgZm9vCg==</sv:value>
             </sv:property>
+            <sv:property sv:name="encoding?%$-test" sv:type="Binary">
+                <sv:value>aDEuIENoYXB0ZXIgMSBUaXRsZQoKKiBmb28KKiBiYXIKKiogZm9vMgoqKiBmb28zCiogZm9vMAoKfHwgaGVhZGVyIHx8IGJhciB8fAp8IGggfCBqIHwKCntjb2RlfQpoZWxsbyB3b3JsZAp7Y29kZX0KCiMgZm9vCg==</sv:value>
+            </sv:property>
+            <sv:property sv:name="encoding?" sv:type="Binary">
+                <sv:value>aDEuIENoYXB0ZXIgMSBUaXRsZQoKKiBmb28KKiBiYXIKKiogZm9vMgoqKiBmb28zCiogZm9vMAoKfHwgaGVhZGVyIHx8IGJhciB8fAp8IGggfCBqIHwKCntjb2RlfQpoZWxsbyB3b3JsZAp7Y29kZX0KCiMgZm9vCg==</sv:value>
+            </sv:property>
             <sv:property sv:name="multidata" sv:type="Binary" sv:multiple="true">
                 <sv:value>aDEuIENoYXB0ZXIgMSBUaXRsZQoKKiBmb28KKiBiYXIKKiogZm9vMgoqKiBmb28zCiogZm9vMAoKfHwgaGVhZGVyIHx8IGJhciB8fAp8IGggfCBqIHwKCntjb2RlfQpoZWxsbyB3b3JsZAp7Y29kZX0KCiMgZm9vCg==</sv:value>
                 <sv:value>aDEuIENoYXB0ZXIgMSBUaXRsZQoKKiBmb28KKiBiYXIKKiogZm9vMgoqKiBmb28zCiogZm9vMAoKfHwgaGVhZGVyIHx8IGJhciB8fAp8IGggfCBqIHwKCntjb2RlfQpoZWxsbyB3b3JsZAp7Y29kZX0KCiMgZm9vCg==</sv:value>
diff --git a/tests/05_Reading/BinaryReadMethodsTest.php b/tests/05_Reading/BinaryReadMethodsTest.php
index f787d299..836379be 100644
--- a/tests/05_Reading/BinaryReadMethodsTest.php
+++ b/tests/05_Reading/BinaryReadMethodsTest.php
@@ -116,4 +116,24 @@ public function testGetLengthMultivalue()
             $this->assertEquals(strlen($this->decodedstring), $size);
         }
     }
+
+    public function testReadBinaryPathEncoding()
+    {
+        $node = $this->session->getRootNode()->getNode('tests_general_base/index.txt/jcr:content');
+        $binary = $node->getProperty('encoding?%$-test');
+        $this->assertEquals(\PHPCR\PropertyType::BINARY, $binary->getType());
+        $value = $binary->getString();
+        $this->assertInternalType('string', $value);
+        $this->assertEquals($this->decodedstring, $value);
+    }
+
+    public function testReadBinaryPathTrailingQuestionmark()
+    {
+        $node = $this->session->getRootNode()->getNode('tests_general_base/index.txt/jcr:content');
+        $binary = $node->getProperty('encoding?');
+        $this->assertEquals(\PHPCR\PropertyType::BINARY, $binary->getType());
+        $value = $binary->getString();
+        $this->assertInternalType('string', $value);
+        $this->assertEquals($this->decodedstring, $value);
+    }
 }
diff --git a/tests/05_Reading/EncodingTest.php b/tests/05_Reading/EncodingTest.php
index 8df6a5f3..ee45fd21 100644
--- a/tests/05_Reading/EncodingTest.php
+++ b/tests/05_Reading/EncodingTest.php
@@ -45,6 +45,8 @@ public static function getNodeNames()
             array("node- -x"),
             array("node-ç-x"),
             array("node-&-x"),
+            array("node?"),
+            array("node-¢"),
         );
     }
 }