diff --git a/mopidy/internal/path.py b/mopidy/internal/path.py
index f56520f0..8c560187 100644
--- a/mopidy/internal/path.py
+++ b/mopidy/internal/path.py
@@ -192,7 +192,8 @@ def _find(root, thread_count=10, relative=False, follow=False):
 
 def find_mtimes(root, follow=False):
     results, errors = _find(root, relative=False, follow=follow)
-    mtimes = dict((f, int(st.st_mtime * 1000)) for f, st in results.items())
+    # return the mtimes as integer milliseconds
+    mtimes = {f: int(st.st_mtime * 1000) for f, st in results.items()}
     return mtimes, errors
 
 
diff --git a/tests/__init__.py b/tests/__init__.py
index fc8d5dcf..c76c48f0 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -32,6 +32,6 @@ class IsA(object):
         return str(self.klass)
 
 
-any_int = IsA(int)
+any_int = IsA((int, long))
 any_str = IsA(str)
 any_unicode = IsA(compat.text_type)
diff --git a/tests/core/test_history.py b/tests/core/test_history.py
index 48062aaf..068518b6 100644
--- a/tests/core/test_history.py
+++ b/tests/core/test_history.py
@@ -40,7 +40,7 @@ class PlaybackHistoryTest(unittest.TestCase):
         result = self.history.get_history()
         (timestamp, ref) = result[0]
 
-        self.assertIsInstance(timestamp, int)
+        self.assertIsInstance(timestamp, (int, long))
         self.assertEqual(track.uri, ref.uri)
         self.assertIn(track.name, ref.name)
         for artist in track.artists:
diff --git a/tests/internal/test_path.py b/tests/internal/test_path.py
index 503d2490..0d266725 100644
--- a/tests/internal/test_path.py
+++ b/tests/internal/test_path.py
@@ -380,6 +380,18 @@ class FindMTimesTest(unittest.TestCase):
         self.assertEqual(expected, result)
         self.assertEqual({}, errors)
 
+    def test_gives_mtime_in_milliseconds(self):
+        fname = self.touch('foobar')
+
+        os.utime(fname, (1, 3.14159265))
+
+        result, errors = path.find_mtimes(fname)
+
+        self.assertEqual(len(result), 1)
+        mtime, = result.values()
+        self.assertEqual(mtime, 3141)
+        self.assertEqual(errors, {})
+
 
 # TODO: kill this in favour of just os.path.getmtime + mocks
 class MtimeTest(unittest.TestCase):