diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index a25e3a4bb..561175bee 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -46,8 +46,8 @@ import qutebrowser.resources
 from qutebrowser.completion.models import instances as completionmodels
 from qutebrowser.commands import cmdutils, runners, cmdexc
 from qutebrowser.config import style, config, websettings, configexc
-from qutebrowser.browser import urlmarks, adblock
-from qutebrowser.browser.webkit import cookies, cache, history, downloads
+from qutebrowser.browser import urlmarks, adblock, history
+from qutebrowser.browser.webkit import cookies, cache, downloads
 from qutebrowser.browser.webkit.network import (qutescheme, proxy,
                                                 networkmanager)
 from qutebrowser.mainwindow import mainwindow
diff --git a/qutebrowser/browser/webkit/history.py b/qutebrowser/browser/history.py
similarity index 100%
rename from qutebrowser/browser/webkit/history.py
rename to qutebrowser/browser/history.py
diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index 89fca47d7..e79ed0b74 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -29,8 +29,7 @@ from PyQt5.QtNetwork import (QNetworkRequest, QAbstractNetworkCache,
                              QNetworkCacheMetaData)
 from PyQt5.QtWidgets import QCommonStyle, QLineEdit, QWidget
 
-from qutebrowser.browser import browsertab
-from qutebrowser.browser.webkit import history
+from qutebrowser.browser import browsertab, history
 from qutebrowser.config import configexc
 from qutebrowser.utils import usertypes, utils
 from qutebrowser.mainwindow import mainwindow
diff --git a/tests/unit/browser/webkit/test_history.py b/tests/unit/browser/webkit/test_history.py
index 3da69e9f0..43ef8506d 100644
--- a/tests/unit/browser/webkit/test_history.py
+++ b/tests/unit/browser/webkit/test_history.py
@@ -28,7 +28,7 @@ from hypothesis import strategies
 from PyQt5.QtCore import QUrl
 from PyQt5.QtWebKit import QWebHistoryInterface
 
-from qutebrowser.browser.webkit import history
+from qutebrowser.browser import history
 from qutebrowser.utils import objreg
 
 
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index 6772e1201..6d4f66c34 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -27,7 +27,7 @@ from PyQt5.QtCore import QUrl
 from PyQt5.QtWidgets import QTreeView
 
 from qutebrowser.completion.models import miscmodels, urlmodel, configmodel
-from qutebrowser.browser.webkit import history
+from qutebrowser.browser import history
 from qutebrowser.config import sections, value