diff --git a/.travis.yml b/.travis.yml
index f78a0bb5..c38851a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,9 @@ python:
 install:
     - sudo apt-get update -q
     - sudo apt-get install intltool desktop-file-utils
-    - pip3 install coverage minimock pycodestyle
+    - pip3 install coverage minimock pycodestyle isort
     - python3 tools/localdepends.py
 script:
     - pycodestyle share src/gpodder tools bin/* *.py
+    - isort -c -rc
     - make releasetest
diff --git a/bin/gpo b/bin/gpo
index dfa512aa..eb07ef2a 100755
--- a/bin/gpo
+++ b/bin/gpo
@@ -76,10 +76,6 @@ import re
 import shlex
 import sys
 
-import gpodder
-from gpodder import common, core, download, log, model, my, opml, util, youtube
-from gpodder.config import config_value_to_string
-
 try:
     import readline
 except ImportError:
@@ -115,6 +111,7 @@ if os.path.exists(os.path.join(src_dir, 'gpodder', '__init__.py')):
     # Run gPodder from local source folder (not installed)
     sys.path.insert(0, src_dir)
 
+import gpodder  # isort:skip
 _ = gpodder.gettext
 N_ = gpodder.ngettext
 
@@ -128,8 +125,10 @@ have_ansi = sys.stdout.isatty() and not gpodder.ui.win32
 interactive_console = sys.stdin.isatty() and sys.stdout.isatty()
 is_single_command = False
 
-log.setup(verbose)
+gpodder.log.setup(verbose)
 
+from gpodder import common, core, download, model, my, opml, util, youtube  # isort:skip
+from gpodder.config import config_value_to_string  # isort:skip
 
 
 def incolor(color_id, s):