diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 303a19a..5dc31c7 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -667,7 +667,7 @@ public class JSONObjectTest {
         assertTrue("expected 1 top level item", ((Map<?,?>)(JsonPath.read(doc, "$"))).size() == 1);
         assertTrue("expected 6 myArray items", ((List<?>)(JsonPath.read(doc, "$.myArray"))).size() == 6);
         assertTrue("expected true", Boolean.TRUE.equals(jsonObject.query("/myArray/0")));
-        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/myArray/1/")));
+        assertTrue("expected false", Boolean.FALSE.equals(jsonObject.query("/myArray/1")));
         assertTrue("expected hello world!", "hello world!".equals(jsonObject.query("/myArray/2")));
         assertTrue("expected h\be\tllo w\u1234orld!", "h\be\tllo w\u1234orld!".equals(jsonObject.query("/myArray/3")));
         assertTrue("expected 42", Integer.valueOf(42).equals(jsonObject.query("/myArray/4")));
diff --git a/src/test/java/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
index 19dac47..5ddd089 100644
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
@@ -62,6 +62,27 @@ public class JSONPointerTest {
         assertSame(document.get(""), query("/"));
     }
 
+    @Test
+    public void queryByEmptyKeySubObject() {
+        assertSame(document.getJSONObject("obj").getJSONObject(""), query("/obj/"));
+    }
+
+    @Test
+    public void queryByEmptyKeySubObjectSubOject() {
+        assertSame(
+            document.getJSONObject("obj").getJSONObject("").get(""),
+            query("/obj//")
+        );
+    }
+    
+    @Test
+    public void queryByEmptyKeySubObjectValue() {
+        assertSame(
+            document.getJSONObject("obj").getJSONObject("").get("subKey"),
+            query("/obj//subKey")
+        );
+    }
+
     @Test
     public void slashEscaping() {
         assertSame(document.get("a/b"), query("/a~1b"));
diff --git a/src/test/resources/jsonpointer-testdoc.json b/src/test/resources/jsonpointer-testdoc.json
index d58fe82..657ccdd 100644
--- a/src/test/resources/jsonpointer-testdoc.json
+++ b/src/test/resources/jsonpointer-testdoc.json
@@ -19,6 +19,10 @@
 			"another/key" : [
 				"val"
 			]
+		},
+		"" : {
+		    "" : "empty key of an object with an empty key",
+		    "subKey" : "Some other value"
 		}
 	}
 }
\ No newline at end of file