diff --git a/MANIFEST.in b/MANIFEST.in
index a1e2b374f..046cfc193 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,8 @@
 include LICENSE
 include README.rst
+exclude mptt/__init__.py
 recursive-include filer/locale *
 recursive-include filer/static *
 recursive-include filer/templates *
 recursive-exclude * *.py[co]
+recursive-exclude tests *
diff --git a/filer/models/abstract.py b/filer/models/abstract.py
index 6324b445b..696bdd634 100644
--- a/filer/models/abstract.py
+++ b/filer/models/abstract.py
@@ -1,10 +1,10 @@
 import logging
 
-import easy_thumbnails.utils
 from django.db import models
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
+import easy_thumbnails.utils
 from easy_thumbnails.VIL import Image as VILImage
 
 from .. import settings as filer_settings