diff --git a/tests/integration/data/hints/html/simple.html b/tests/integration/data/hints/html/simple.html
new file mode 100644
index 000000000..40e908a13
--- /dev/null
+++ b/tests/integration/data/hints/html/simple.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+ Simple link
+
+
+ Follow me!
+
+
diff --git a/tests/integration/test_hints_html.py b/tests/integration/test_hints_html.py
new file mode 100644
index 000000000..cc668193d
--- /dev/null
+++ b/tests/integration/test_hints_html.py
@@ -0,0 +1,56 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2016 Florian Bruhin (The Compiler)
+#
+# 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 .
+
+"""Test hints based on html files with special comments."""
+
+import os
+import os.path
+
+import yaml
+import pytest
+import bs4
+
+
+def collect_tests():
+ basedir = os.path.dirname(__file__)
+ datadir = os.path.join(basedir, 'data', 'hints', 'html')
+ files = os.listdir(datadir)
+ return files
+
+
+@pytest.mark.parametrize('test_name', collect_tests())
+def test_hints(test_name, quteproc):
+ file_path = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+ 'data', 'hints', 'html', test_name)
+ url_path = 'data/hints/html/{}'.format(test_name)
+ quteproc.open_path(url_path)
+ quteproc.wait_for_load_finished(url_path)
+
+ with open(file_path, 'r', encoding='utf-8') as html:
+ soup = bs4.BeautifulSoup(html, 'html.parser')
+
+ comment = soup.find(text=lambda text: isinstance(text, bs4.Comment))
+ parsed = yaml.load(comment)
+
+ assert set(parsed.keys()) == {'target'}
+
+ quteproc.send_cmd(':hint links normal')
+ quteproc.wait_for(message='hints: a', category='hints')
+ quteproc.send_cmd(':follow-hint a')
+ quteproc.wait_for_load_finished('data/' + parsed['target'])