diff --git a/sapl/audiencia/tests/test_audiencia.py b/sapl/audiencia/tests/test_audiencia.py
index 9c2dca2e4..5640b3d0d 100644
--- a/sapl/audiencia/tests/test_audiencia.py
+++ b/sapl/audiencia/tests/test_audiencia.py
@@ -1,5 +1,5 @@
 import pytest
-from sapl.translation import ugettext as _
+from django.utils.translation import ugettext as _
 from model_mommy import mommy
 
 from sapl.audiencia import forms
diff --git a/sapl/comissoes/tests/test_comissoes.py b/sapl/comissoes/tests/test_comissoes.py
index 88489ea87..4d12ba810 100644
--- a/sapl/comissoes/tests/test_comissoes.py
+++ b/sapl/comissoes/tests/test_comissoes.py
@@ -1,6 +1,6 @@
 import pytest
 from django.core.urlresolvers import reverse
-from sapl.translation import ugettext as _
+from django.utils.translation import ugettext as _
 from model_mommy import mommy
 
 from sapl.comissoes.models import Comissao, Composicao, Periodo, TipoComissao, Reuniao
diff --git a/sapl/compilacao/tests/test_tipo_texto_articulado_form.py b/sapl/compilacao/tests/test_tipo_texto_articulado_form.py
index e86c8b9be..6c64adc78 100644
--- a/sapl/compilacao/tests/test_tipo_texto_articulado_form.py
+++ b/sapl/compilacao/tests/test_tipo_texto_articulado_form.py
@@ -1,5 +1,5 @@
 import pytest
-from sapl.translation import ugettext as _
+from django.utils.translation import ugettext as _
 from model_mommy import mommy
 
 from sapl.compilacao import forms
diff --git a/sapl/materia/tests/test_materia_form.py b/sapl/materia/tests/test_materia_form.py
index 4b53fa92c..944cabf00 100644
--- a/sapl/materia/tests/test_materia_form.py
+++ b/sapl/materia/tests/test_materia_form.py
@@ -1,5 +1,5 @@
 import pytest
-from sapl.translation import ugettext as _
+from django.utils.translation import ugettext as _
 from model_mommy import mommy
 
 from sapl.materia import forms
diff --git a/sapl/templates/audiencia/floppyforms/image_thumbnail.html b/sapl/templates/floppyforms/image_thumbnail.html
similarity index 100%
rename from sapl/templates/audiencia/floppyforms/image_thumbnail.html
rename to sapl/templates/floppyforms/image_thumbnail.html