diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index c1cf42f9..c91740a3 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -22,6 +22,7 @@ except ImportError:
     raise
 
 GObject.threads_init()
+Gst.init()
 
 try:
     # Make GObject's mainloop the event loop for python-dbus
@@ -33,13 +34,6 @@ except ImportError:
 
 import pykka.debug
 
-
-# Extract any command line arguments. This needs to be done before GStreamer is
-# imported, so that GStreamer doesn't hijack e.g. ``--help``.
-mopidy_args = sys.argv[1:]
-sys.argv[1:] = []
-
-
 from mopidy import commands, config as config_lib, ext
 from mopidy.internal import encoding, log, path, process, versioning
 
@@ -73,7 +67,7 @@ def main():
                 data.command.set(extension=data.extension)
                 root_cmd.add_child(data.extension.ext_name, data.command)
 
-        args = root_cmd.parse(mopidy_args)
+        args = root_cmd.parse(sys.argv[1:])
 
         config, config_errors = config_lib.load(
             args.config_files,
diff --git a/mopidy/audio/scan.py b/mopidy/audio/scan.py
index ba6adaf0..573d2fab 100644
--- a/mopidy/audio/scan.py
+++ b/mopidy/audio/scan.py
@@ -191,6 +191,7 @@ if __name__ == '__main__':
     from mopidy.internal import path
 
     GObject.threads_init()
+    Gst.init()
 
     scanner = Scanner(5000)
     for uri in sys.argv[1:]:
diff --git a/tests/audio/test_actor.py b/tests/audio/test_actor.py
index e1841561..48d3704b 100644
--- a/tests/audio/test_actor.py
+++ b/tests/audio/test_actor.py
@@ -6,7 +6,9 @@ import unittest
 import gi
 gi.require_version('Gst', '1.0')
 from gi.repository import GObject, Gst
+
 GObject.threads_init()
+Gst.init()
 
 import mock
 
diff --git a/tests/audio/test_scan.py b/tests/audio/test_scan.py
index 08def2af..ab995285 100644
--- a/tests/audio/test_scan.py
+++ b/tests/audio/test_scan.py
@@ -8,7 +8,7 @@ gi.require_version('Gst', '1.0')
 from gi.repository import GObject, Gst
 
 GObject.threads_init()
-Gst.init(None)
+Gst.init()
 
 from mopidy import exceptions
 from mopidy.audio import scan