diff --git a/tests/integration/features/test_urlmarks.py b/tests/integration/features/test_urlmarks.py
new file mode 100644
index 000000000..14a450e7f
--- /dev/null
+++ b/tests/integration/features/test_urlmarks.py
@@ -0,0 +1,45 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+import os.path
+
+import pytest_bdd as bdd
+
+from helpers import utils  # pylint: disable=import-error
+
+bdd.scenarios('urlmarks.feature')
+
+
+@bdd.then(bdd.parsers.parse('the bookmark file should contain "{expected}"'))
+def bookmark_file_contains(quteproc, expected):
+    bookmark_file = os.path.join(quteproc.basedir, 'config', 'bookmarks',
+                                 'urls')
+
+    quteproc.clear_data()  # So we don't match old messages
+    quteproc.send_cmd(':save')
+    quteproc.wait_for(message='Saved to {}'.format(bookmark_file))
+
+    with open(bookmark_file, 'r', encoding='utf-8') as f:
+        lines = f.readlines()
+
+    matched_line = any(
+        utils.pattern_match(pattern=expected, value=line.rstrip('\n'))
+        for line in lines)
+
+    assert matched_line, lines
diff --git a/tests/integration/features/urlmarks.feature b/tests/integration/features/urlmarks.feature
new file mode 100644
index 000000000..e4000443b
--- /dev/null
+++ b/tests/integration/features/urlmarks.feature
@@ -0,0 +1,7 @@
+Feature: quickmarks and bookmarks
+
+    Scenario: Saving a bookmark
+        When I open data/title.html
+        And I run :bookmark-add
+        Then the message "Bookmarked http://localhost:*/data/title.html!" should be shown
+        And the bookmark file should contain "http://localhost:*/data/title.html Test title"