diff --git a/tests/conftest.py b/tests/conftest.py
index c24715c66..7b8ad5c0b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -27,8 +27,8 @@ import logging
 
 import pytest
 
-import stubs as stubsmod
-import logfail
+import helpers.stubs as stubsmod
+from helpers import logfail
 from qutebrowser.config import config
 from qutebrowser.utils import objreg, usertypes
 
diff --git a/tests/logfail.py b/tests/helpers/logfail.py
similarity index 100%
rename from tests/logfail.py
rename to tests/helpers/logfail.py
diff --git a/tests/stubs.py b/tests/helpers/stubs.py
similarity index 100%
rename from tests/stubs.py
rename to tests/helpers/stubs.py
diff --git a/tests/test_logfail.py b/tests/helpers/test_logfail.py
similarity index 100%
rename from tests/test_logfail.py
rename to tests/helpers/test_logfail.py
diff --git a/tests/test_stubs.py b/tests/helpers/test_stubs.py
similarity index 100%
rename from tests/test_stubs.py
rename to tests/helpers/test_stubs.py
diff --git a/tests/browser/http/test_content_disposition.py b/tests/unit/browser/http/test_content_disposition.py
similarity index 100%
rename from tests/browser/http/test_content_disposition.py
rename to tests/unit/browser/http/test_content_disposition.py
diff --git a/tests/browser/http/test_http.py b/tests/unit/browser/http/test_http.py
similarity index 100%
rename from tests/browser/http/test_http.py
rename to tests/unit/browser/http/test_http.py
diff --git a/tests/browser/http/test_http_hypothesis.py b/tests/unit/browser/http/test_http_hypothesis.py
similarity index 100%
rename from tests/browser/http/test_http_hypothesis.py
rename to tests/unit/browser/http/test_http_hypothesis.py
diff --git a/tests/browser/network/test_filescheme.py b/tests/unit/browser/network/test_filescheme.py
similarity index 100%
rename from tests/browser/network/test_filescheme.py
rename to tests/unit/browser/network/test_filescheme.py
diff --git a/tests/browser/network/test_networkreply.py b/tests/unit/browser/network/test_networkreply.py
similarity index 100%
rename from tests/browser/network/test_networkreply.py
rename to tests/unit/browser/network/test_networkreply.py
diff --git a/tests/browser/network/test_schemehandler.py b/tests/unit/browser/network/test_schemehandler.py
similarity index 100%
rename from tests/browser/network/test_schemehandler.py
rename to tests/unit/browser/network/test_schemehandler.py
diff --git a/tests/browser/test_commands.py b/tests/unit/browser/test_commands.py
similarity index 100%
rename from tests/browser/test_commands.py
rename to tests/unit/browser/test_commands.py
diff --git a/tests/browser/test_signalfilter.py b/tests/unit/browser/test_signalfilter.py
similarity index 100%
rename from tests/browser/test_signalfilter.py
rename to tests/unit/browser/test_signalfilter.py
diff --git a/tests/browser/test_tabhistory.py b/tests/unit/browser/test_tabhistory.py
similarity index 100%
rename from tests/browser/test_tabhistory.py
rename to tests/unit/browser/test_tabhistory.py
diff --git a/tests/browser/test_webelem.py b/tests/unit/browser/test_webelem.py
similarity index 100%
rename from tests/browser/test_webelem.py
rename to tests/unit/browser/test_webelem.py
diff --git a/tests/browser/test_webelem_jsescape.html b/tests/unit/browser/test_webelem_jsescape.html
similarity index 100%
rename from tests/browser/test_webelem_jsescape.html
rename to tests/unit/browser/test_webelem_jsescape.html
diff --git a/tests/commands/test_cmdutils.py b/tests/unit/commands/test_cmdutils.py
similarity index 100%
rename from tests/commands/test_cmdutils.py
rename to tests/unit/commands/test_cmdutils.py
diff --git a/tests/commands/test_runners.py b/tests/unit/commands/test_runners.py
similarity index 100%
rename from tests/commands/test_runners.py
rename to tests/unit/commands/test_runners.py
diff --git a/tests/completion/test_column_widths.py b/tests/unit/completion/test_column_widths.py
similarity index 100%
rename from tests/completion/test_column_widths.py
rename to tests/unit/completion/test_column_widths.py
diff --git a/tests/config/test_config.py b/tests/unit/config/test_config.py
similarity index 100%
rename from tests/config/test_config.py
rename to tests/unit/config/test_config.py
diff --git a/tests/config/test_configdata.py b/tests/unit/config/test_configdata.py
similarity index 100%
rename from tests/config/test_configdata.py
rename to tests/unit/config/test_configdata.py
diff --git a/tests/config/test_configexc.py b/tests/unit/config/test_configexc.py
similarity index 100%
rename from tests/config/test_configexc.py
rename to tests/unit/config/test_configexc.py
diff --git a/tests/config/test_configtypes.py b/tests/unit/config/test_configtypes.py
similarity index 100%
rename from tests/config/test_configtypes.py
rename to tests/unit/config/test_configtypes.py
diff --git a/tests/config/test_configtypes_hypothesis.py b/tests/unit/config/test_configtypes_hypothesis.py
similarity index 100%
rename from tests/config/test_configtypes_hypothesis.py
rename to tests/unit/config/test_configtypes_hypothesis.py
diff --git a/tests/config/test_textwrapper.py b/tests/unit/config/test_textwrapper.py
similarity index 100%
rename from tests/config/test_textwrapper.py
rename to tests/unit/config/test_textwrapper.py
diff --git a/tests/javascript/base.html b/tests/unit/javascript/base.html
similarity index 100%
rename from tests/javascript/base.html
rename to tests/unit/javascript/base.html
diff --git a/tests/javascript/conftest.py b/tests/unit/javascript/conftest.py
similarity index 100%
rename from tests/javascript/conftest.py
rename to tests/unit/javascript/conftest.py
diff --git a/tests/javascript/position_caret/invisible.html b/tests/unit/javascript/position_caret/invisible.html
similarity index 100%
rename from tests/javascript/position_caret/invisible.html
rename to tests/unit/javascript/position_caret/invisible.html
diff --git a/tests/javascript/position_caret/scrolled_down.html b/tests/unit/javascript/position_caret/scrolled_down.html
similarity index 100%
rename from tests/javascript/position_caret/scrolled_down.html
rename to tests/unit/javascript/position_caret/scrolled_down.html
diff --git a/tests/javascript/position_caret/scrolled_down_img.html b/tests/unit/javascript/position_caret/scrolled_down_img.html
similarity index 100%
rename from tests/javascript/position_caret/scrolled_down_img.html
rename to tests/unit/javascript/position_caret/scrolled_down_img.html
diff --git a/tests/javascript/position_caret/simple.html b/tests/unit/javascript/position_caret/simple.html
similarity index 100%
rename from tests/javascript/position_caret/simple.html
rename to tests/unit/javascript/position_caret/simple.html
diff --git a/tests/javascript/position_caret/test_position_caret.py b/tests/unit/javascript/position_caret/test_position_caret.py
similarity index 100%
rename from tests/javascript/position_caret/test_position_caret.py
rename to tests/unit/javascript/position_caret/test_position_caret.py
diff --git a/tests/keyinput/conftest.py b/tests/unit/keyinput/conftest.py
similarity index 100%
rename from tests/keyinput/conftest.py
rename to tests/unit/keyinput/conftest.py
diff --git a/tests/keyinput/test_basekeyparser.py b/tests/unit/keyinput/test_basekeyparser.py
similarity index 100%
rename from tests/keyinput/test_basekeyparser.py
rename to tests/unit/keyinput/test_basekeyparser.py
diff --git a/tests/keyinput/test_modeparsers.py b/tests/unit/keyinput/test_modeparsers.py
similarity index 100%
rename from tests/keyinput/test_modeparsers.py
rename to tests/unit/keyinput/test_modeparsers.py
diff --git a/tests/mainwindow/statusbar/test_percentage.py b/tests/unit/mainwindow/statusbar/test_percentage.py
similarity index 100%
rename from tests/mainwindow/statusbar/test_percentage.py
rename to tests/unit/mainwindow/statusbar/test_percentage.py
diff --git a/tests/mainwindow/statusbar/test_progress.py b/tests/unit/mainwindow/statusbar/test_progress.py
similarity index 100%
rename from tests/mainwindow/statusbar/test_progress.py
rename to tests/unit/mainwindow/statusbar/test_progress.py
diff --git a/tests/mainwindow/statusbar/test_tabindex.py b/tests/unit/mainwindow/statusbar/test_tabindex.py
similarity index 100%
rename from tests/mainwindow/statusbar/test_tabindex.py
rename to tests/unit/mainwindow/statusbar/test_tabindex.py
diff --git a/tests/mainwindow/statusbar/test_textbase.py b/tests/unit/mainwindow/statusbar/test_textbase.py
similarity index 100%
rename from tests/mainwindow/statusbar/test_textbase.py
rename to tests/unit/mainwindow/statusbar/test_textbase.py
diff --git a/tests/misc/test_crashdialog.py b/tests/unit/misc/test_crashdialog.py
similarity index 100%
rename from tests/misc/test_crashdialog.py
rename to tests/unit/misc/test_crashdialog.py
diff --git a/tests/misc/test_editor.py b/tests/unit/misc/test_editor.py
similarity index 100%
rename from tests/misc/test_editor.py
rename to tests/unit/misc/test_editor.py
diff --git a/tests/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
similarity index 100%
rename from tests/misc/test_guiprocess.py
rename to tests/unit/misc/test_guiprocess.py
diff --git a/tests/misc/test_lineparser.py b/tests/unit/misc/test_lineparser.py
similarity index 100%
rename from tests/misc/test_lineparser.py
rename to tests/unit/misc/test_lineparser.py
diff --git a/tests/misc/test_miscwidgets.py b/tests/unit/misc/test_miscwidgets.py
similarity index 100%
rename from tests/misc/test_miscwidgets.py
rename to tests/unit/misc/test_miscwidgets.py
diff --git a/tests/misc/test_msgbox.py b/tests/unit/misc/test_msgbox.py
similarity index 100%
rename from tests/misc/test_msgbox.py
rename to tests/unit/misc/test_msgbox.py
diff --git a/tests/misc/test_readline.py b/tests/unit/misc/test_readline.py
similarity index 100%
rename from tests/misc/test_readline.py
rename to tests/unit/misc/test_readline.py
diff --git a/tests/misc/test_split.py b/tests/unit/misc/test_split.py
similarity index 100%
rename from tests/misc/test_split.py
rename to tests/unit/misc/test_split.py
diff --git a/tests/misc/test_split_hypothesis.py b/tests/unit/misc/test_split_hypothesis.py
similarity index 100%
rename from tests/misc/test_split_hypothesis.py
rename to tests/unit/misc/test_split_hypothesis.py
diff --git a/tests/utils/overflow_test_cases.py b/tests/unit/utils/overflow_test_cases.py
similarity index 100%
rename from tests/utils/overflow_test_cases.py
rename to tests/unit/utils/overflow_test_cases.py
diff --git a/tests/utils/test_debug.py b/tests/unit/utils/test_debug.py
similarity index 100%
rename from tests/utils/test_debug.py
rename to tests/unit/utils/test_debug.py
diff --git a/tests/utils/test_error.py b/tests/unit/utils/test_error.py
similarity index 100%
rename from tests/utils/test_error.py
rename to tests/unit/utils/test_error.py
diff --git a/tests/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
similarity index 100%
rename from tests/utils/test_jinja.py
rename to tests/unit/utils/test_jinja.py
diff --git a/tests/utils/test_log.py b/tests/unit/utils/test_log.py
similarity index 100%
rename from tests/utils/test_log.py
rename to tests/unit/utils/test_log.py
diff --git a/tests/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py
similarity index 100%
rename from tests/utils/test_qtutils.py
rename to tests/unit/utils/test_qtutils.py
diff --git a/tests/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
similarity index 100%
rename from tests/utils/test_standarddir.py
rename to tests/unit/utils/test_standarddir.py
diff --git a/tests/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
similarity index 100%
rename from tests/utils/test_urlutils.py
rename to tests/unit/utils/test_urlutils.py
diff --git a/tests/utils/test_utils.py b/tests/unit/utils/test_utils.py
similarity index 100%
rename from tests/utils/test_utils.py
rename to tests/unit/utils/test_utils.py
diff --git a/tests/utils/test_version.py b/tests/unit/utils/test_version.py
similarity index 100%
rename from tests/utils/test_version.py
rename to tests/unit/utils/test_version.py
diff --git a/tests/utils/usertypes/test_enum.py b/tests/unit/utils/usertypes/test_enum.py
similarity index 100%
rename from tests/utils/usertypes/test_enum.py
rename to tests/unit/utils/usertypes/test_enum.py
diff --git a/tests/utils/usertypes/test_neighborlist.py b/tests/unit/utils/usertypes/test_neighborlist.py
similarity index 100%
rename from tests/utils/usertypes/test_neighborlist.py
rename to tests/unit/utils/usertypes/test_neighborlist.py
diff --git a/tests/utils/usertypes/test_question.py b/tests/unit/utils/usertypes/test_question.py
similarity index 100%
rename from tests/utils/usertypes/test_question.py
rename to tests/unit/utils/usertypes/test_question.py
diff --git a/tests/utils/usertypes/test_timer.py b/tests/unit/utils/usertypes/test_timer.py
similarity index 100%
rename from tests/utils/usertypes/test_timer.py
rename to tests/unit/utils/usertypes/test_timer.py