diff --git a/mopidy/frontends/mpd/translator.py b/mopidy/frontends/mpd/translator.py
index 96edae49..2b1adf50 100644
--- a/mopidy/frontends/mpd/translator.py
+++ b/mopidy/frontends/mpd/translator.py
@@ -147,7 +147,7 @@ def _add_to_tag_cache(result, folders, files):
 def tracks_to_directory_tree(tracks):
     directories = ({}, [])
     for track in tracks:
-        path = ''
+        path = u''
         current = directories
 
         local_folder = os.path.expanduser(settings.LOCAL_MUSIC_FOLDER)
diff --git a/mopidy/scanner.py b/mopidy/scanner.py
index c32115f7..436598bd 100644
--- a/mopidy/scanner.py
+++ b/mopidy/scanner.py
@@ -83,7 +83,7 @@ class Scanner(object):
     def process_tags(self, bus, message):
         data = message.parse_tag()
         data = dict([(k, data[k]) for k in data.keys()])
-        data['uri'] = self.uribin.get_property('uri')
+        data['uri'] = unicode(self.uribin.get_property('uri'))
         data['duration'] = self.get_duration()
         self.data_callback(data)
         self.next_uri()
diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py
index 78377891..b3669e38 100644
--- a/mopidy/utils/path.py
+++ b/mopidy/utils/path.py
@@ -49,13 +49,17 @@ def find_files(path):
     path = os.path.expanduser(path)
     if os.path.isfile(path):
         filename = os.path.abspath(path)
-        yield filename.decode('utf-8')
+        if not isinstance(filename, unicode):
+            filename = filename.decode('utf-8')
+        yield filename
     else:
         for dirpath, dirnames, filenames in os.walk(path):
             for filename in filenames:
                 dirpath = os.path.abspath(dirpath)
                 filename = os.path.join(dirpath, filename)
-                yield filename.decode('utf-8')
+                if not isinstance(filename, unicode):
+                    filename = filename.decode('utf-8')
+                yield filename
 
 class Mtime(object):
     def __init__(self):