diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/inline/test_queryurl.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/inline/test_queryurl.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,52 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+add_autocomplete_test([
+  "Searching for host match without slash should match host",
+  "file",
+  "file.org/",
+  function () {
+    promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
+                       transition: TRANSITION_TYPED },
+                     { uri: NetUtil.newURI("file:///c:/test.html"),
+                       transition: TRANSITION_TYPED }
+                    );
+  },
+]);
+
+add_autocomplete_test([
+  "Searching match with slash at the end should do nothing",
+  "file.org/",
+  "file.org/",
+  function () {
+    promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
+                       transition: TRANSITION_TYPED },
+                     { uri: NetUtil.newURI("file:///c:/test.html"),
+                       transition: TRANSITION_TYPED }
+                    );
+  },
+]);
+
+add_autocomplete_test([
+  "Searching match with slash in the middle should match url",
+  "file.org/t",
+  "file.org/test/",
+  function () {
+    promiseAddVisits({ uri: NetUtil.newURI("http://file.org/test/"),
+                       transition: TRANSITION_TYPED },
+                     { uri: NetUtil.newURI("file:///c:/test.html"),
+                       transition: TRANSITION_TYPED }
+                    );
+  },
+]);
+
+add_autocomplete_test([
+  "Searching for non-host match without slash should not match url",
+  "file",
+  "file",
+  function () {
+    promiseAddVisits({ uri: NetUtil.newURI("file:///c:/test.html"),
+                       transition: TRANSITION_TYPED });
+  },
+]);