diff --git a/.pylintrc b/.pylintrc
index 68c0cee76a534e143aff496e8914a01a03eae837..5fde3fa31c47e51a6d5532bf0314e370d8b3b5f2 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -7,4 +7,5 @@
 disable=attribute-defined-outside-init,
 	duplicate-code,
 	fixme,
-        missing-docstring
+        missing-docstring,
+        wrong-import-position
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..e645cdd1a83db27370d574e44f7e6c0e752fab36
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[pycodestyle]
+ignore = E126,E402
diff --git a/src/briar-gtk.in b/src/briar-gtk.in
index a0ab663418038381763817f013b1bcf5fc74790f..aac441d2941f2677e472055e4358dad05c27f954 100755
--- a/src/briar-gtk.in
+++ b/src/briar-gtk.in
@@ -13,8 +13,6 @@ import os
 import signal
 import sys
 
-import gi
-gi.require_version('Gtk', '3.0')
 from gi.repository import Gio
 
 PACKAGE_DATA_DIR = '@PACKAGE_DATA_DIR@'
diff --git a/src/briar/gtk/application.py b/src/briar/gtk/application.py
index c834d0f3c240e2da8e4870fee05bc93112754f41..eddfebb09a84a081e9a42cbe30855c2c44bb5a15 100644
--- a/src/briar/gtk/application.py
+++ b/src/briar/gtk/application.py
@@ -6,6 +6,9 @@
 # Initial version based on GNOME Lollypop
 # https://gitlab.gnome.org/World/lollypop/blob/1.0.2/lollypop/application.py
 
+import gi
+gi.require_version('Gdk', '3.0')
+gi.require_version('Gtk', '3.0')
 from gi.repository import Gdk, Gio, GLib, Gtk
 
 from briar_wrapper.api import Api
diff --git a/tests/briar/gtk/test_application.py b/tests/briar/gtk/test_application.py
index a86f3f2f423361d8a444f81b68eca02fd166cff5..16076374a34a664f8b6e216a94d75ce39f0250a2 100644
--- a/tests/briar/gtk/test_application.py
+++ b/tests/briar/gtk/test_application.py
@@ -4,6 +4,8 @@
 
 from unittest.mock import Mock
 
+import pytest
+
 from briar_wrapper.api import Api
 from briar.gtk.application import Application
 from briar.gtk.define import APPLICATION_NAME, APPLICATION_STYLING_PATH
@@ -137,3 +139,8 @@ def test_setup_window_has_none_attribute(mocker):
 
     window_show_mock.assert_called_once()
     window_present_mock.assert_called_once()
+
+
+@pytest.fixture(autouse=True)
+def glib_set_application_name(mocker):
+    mocker.patch("gi.repository.GLib.set_application_name")
diff --git a/tests/conftest.py b/tests/conftest.py
index 7d483abab486dc70bec807dc24b70931a7414f50..3fad9dbbfa1dbf2d63ddf4a217866fe8741417ad 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -27,5 +27,5 @@ def auth_token():
 def request_headers(auth_token):
     request_headers = {
         "Authorization": 'Bearer %s' % auth_token
-        }
+    }
     return request_headers