diff --git a/lib/federation/activity_pub/activity_pub.ex b/lib/federation/activity_pub/activity_pub.ex
index 5bbced443..285057e1f 100644
--- a/lib/federation/activity_pub/activity_pub.ex
+++ b/lib/federation/activity_pub/activity_pub.ex
@@ -10,7 +10,7 @@ defmodule Mobilizon.Federation.ActivityPub do
 
   import Mobilizon.Federation.ActivityPub.Utils
 
-  alias Mobilizon.{Actors, Config, Events, Reports, Users, Share}
+  alias Mobilizon.{Actors, Config, Events, Reports, Share, Users}
   alias Mobilizon.Actors.{Actor, Follower}
   alias Mobilizon.Events.{Comment, Event, Participant}
   alias Mobilizon.Reports.Report
diff --git a/lib/federation/activity_pub/relay.ex b/lib/federation/activity_pub/relay.ex
index 682a498a6..38b239594 100644
--- a/lib/federation/activity_pub/relay.ex
+++ b/lib/federation/activity_pub/relay.ex
@@ -21,7 +21,7 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
 
   require Logger
 
-  def init() do
+  def init do
     # Wait for everything to settle.
     Process.sleep(1000 * 5)
     get_actor()
diff --git a/lib/federation/activity_stream/converter/event.ex b/lib/federation/activity_stream/converter/event.ex
index 0a6adfd7b..86fd06321 100644
--- a/lib/federation/activity_stream/converter/event.ex
+++ b/lib/federation/activity_stream/converter/event.ex
@@ -6,8 +6,8 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Event do
   internal one, and back.
   """
 
-  alias Mobilizon.Addresses
   alias Mobilizon.Actors.Actor
+  alias Mobilizon.Addresses
   alias Mobilizon.Addresses.Address
   alias Mobilizon.Events.Event, as: EventModel
   alias Mobilizon.Media.Picture
diff --git a/lib/graphql/resolvers/admin.ex b/lib/graphql/resolvers/admin.ex
index 9a99421d5..094bf9d56 100644
--- a/lib/graphql/resolvers/admin.ex
+++ b/lib/graphql/resolvers/admin.ex
@@ -9,11 +9,11 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Admin.ActionLog
   alias Mobilizon.Events
-  alias Mobilizon.Events.{Event, Comment}
+  alias Mobilizon.Events.{Comment, Event}
   alias Mobilizon.Reports.{Note, Report}
-  alias Mobilizon.Users.User
   alias Mobilizon.Service.Statistics
   alias Mobilizon.Storage.Page
+  alias Mobilizon.Users.User
 
   alias Mobilizon.Federation.ActivityPub.Relay
 
diff --git a/lib/graphql/resolvers/event.ex b/lib/graphql/resolvers/event.ex
index 8864091c5..15a20123e 100644
--- a/lib/graphql/resolvers/event.ex
+++ b/lib/graphql/resolvers/event.ex
@@ -5,7 +5,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
 
   alias Mobilizon.{Actors, Admin, Events}
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Events.{Event, Participant, EventParticipantStats}
+  alias Mobilizon.Events.{Event, EventParticipantStats, Participant}
   alias Mobilizon.Users.User
 
   alias Mobilizon.GraphQL.API
diff --git a/lib/graphql/resolvers/user.ex b/lib/graphql/resolvers/user.ex
index 2194f41fd..f70a62d01 100644
--- a/lib/graphql/resolvers/user.ex
+++ b/lib/graphql/resolvers/user.ex
@@ -5,7 +5,7 @@ defmodule Mobilizon.GraphQL.Resolvers.User do
 
   import Mobilizon.Users.Guards
 
-  alias Mobilizon.{Actors, Config, Users, Events}
+  alias Mobilizon.{Actors, Config, Events, Users}
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Storage.Repo
   alias Mobilizon.Users.User
diff --git a/lib/graphql/schema/admin.ex b/lib/graphql/schema/admin.ex
index b7dc5cb96..60e23a63b 100644
--- a/lib/graphql/schema/admin.ex
+++ b/lib/graphql/schema/admin.ex
@@ -5,7 +5,7 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
 
   use Absinthe.Schema.Notation
 
-  alias Mobilizon.Events.{Event, Comment}
+  alias Mobilizon.Events.{Comment, Event}
   alias Mobilizon.Reports.{Note, Report}
 
   alias Mobilizon.GraphQL.Resolvers.Admin
diff --git a/lib/graphql/schema/report.ex b/lib/graphql/schema/report.ex
index db3890f4d..41245c87c 100644
--- a/lib/graphql/schema/report.ex
+++ b/lib/graphql/schema/report.ex
@@ -6,8 +6,8 @@ defmodule Mobilizon.GraphQL.Schema.ReportType do
 
   import Absinthe.Resolution.Helpers, only: [dataloader: 1]
 
-  alias Mobilizon.Reports
   alias Mobilizon.GraphQL.Resolvers.Report
+  alias Mobilizon.Reports
 
   @desc "A report object"
   object :report do
diff --git a/lib/mix/tasks/mobilizon/users/show.ex b/lib/mix/tasks/mobilizon/users/show.ex
index 515c62caa..bd1405fda 100644
--- a/lib/mix/tasks/mobilizon/users/show.ex
+++ b/lib/mix/tasks/mobilizon/users/show.ex
@@ -2,10 +2,12 @@ defmodule Mix.Tasks.Mobilizon.Users.Show do
   @moduledoc """
   Task to display an user details
   """
+
   use Mix.Task
+
+  alias Mobilizon.Actors.Actor
   alias Mobilizon.Users
   alias Mobilizon.Users.User
-  alias Mobilizon.Actors.Actor
 
   @shortdoc "Show a Mobilizon user details"
 
diff --git a/lib/mobilizon.ex b/lib/mobilizon.ex
index 1cd2529c8..15101ae80 100644
--- a/lib/mobilizon.ex
+++ b/lib/mobilizon.ex
@@ -92,7 +92,7 @@ defmodule Mobilizon do
   defp fallback_options(nil), do: []
   defp fallback_options(fallback), do: [fallback: fallback(default: fallback)]
 
-  defp internal_actor() do
+  defp internal_actor do
     %{
       id: :internal_actor_init,
       start: {Task, :start_link, [&ActivityPub.Relay.init/0]},
diff --git a/lib/mobilizon/actors/actor.ex b/lib/mobilizon/actors/actor.ex
index 52d55790b..a6790f8e8 100644
--- a/lib/mobilizon/actors/actor.ex
+++ b/lib/mobilizon/actors/actor.ex
@@ -7,13 +7,12 @@ defmodule Mobilizon.Actors.Actor do
 
   import Ecto.Changeset
 
-  alias Mobilizon.{Actors, Config, Crypto, Share}
+  alias Mobilizon.{Actors, Config, Crypto, Mention, Share}
   alias Mobilizon.Actors.{ActorOpenness, ActorType, ActorVisibility, Follower, Member}
-  alias Mobilizon.Events.{Event, FeedToken, Comment}
+  alias Mobilizon.Events.{Comment, Event, FeedToken}
   alias Mobilizon.Media.File
   alias Mobilizon.Reports.{Note, Report}
   alias Mobilizon.Users.User
-  alias Mobilizon.Mention
 
   alias Mobilizon.Web.Endpoint
   alias Mobilizon.Web.Router.Helpers, as: Routes
diff --git a/lib/mobilizon/events/event.ex b/lib/mobilizon/events/event.ex
index 2702100b6..13172705d 100644
--- a/lib/mobilizon/events/event.ex
+++ b/lib/mobilizon/events/event.ex
@@ -6,31 +6,27 @@ defmodule Mobilizon.Events.Event do
   use Ecto.Schema
 
   import Ecto.Changeset
+
   alias Ecto.Changeset
 
   alias Mobilizon.Actors.Actor
+  alias Mobilizon.{Addresses, Events, Media, Mention}
   alias Mobilizon.Addresses.Address
 
-  alias Mobilizon.Addresses
-
-  alias Mobilizon.Events
-
   alias Mobilizon.Events.{
     Comment,
     EventOptions,
+    EventParticipantStats,
     EventStatus,
     EventVisibility,
     JoinOptions,
-    EventParticipantStats,
     Participant,
     Session,
     Tag,
     Track
   }
 
-  alias Mobilizon.Media
   alias Mobilizon.Media.Picture
-  alias Mobilizon.Mention
   alias Mobilizon.Storage.Repo
 
   alias Mobilizon.Web.Endpoint
diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex
index c26d615f2..372b99a51 100644
--- a/lib/mobilizon/events/events.ex
+++ b/lib/mobilizon/events/events.ex
@@ -10,7 +10,7 @@ defmodule Mobilizon.Events do
 
   import Mobilizon.Storage.Ecto
 
-  alias Ecto.{Multi, Changeset}
+  alias Ecto.{Changeset, Multi}
 
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Addresses.Address
@@ -1078,7 +1078,7 @@ defmodule Mobilizon.Events do
     |> Repo.all()
   end
 
-  def data() do
+  def data do
     Dataloader.Ecto.new(Repo, query: &query/2)
   end
 
diff --git a/lib/mobilizon/mentions/mention.ex b/lib/mobilizon/mentions/mention.ex
index dfded3463..cab57fe2e 100644
--- a/lib/mobilizon/mentions/mention.ex
+++ b/lib/mobilizon/mentions/mention.ex
@@ -6,8 +6,7 @@ defmodule Mobilizon.Mention do
   use Ecto.Schema
   import Ecto.Changeset
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Events.Event
-  alias Mobilizon.Events.Comment
+  alias Mobilizon.Events.{Comment, Event}
   alias Mobilizon.Storage.Repo
 
   @type t :: %__MODULE__{
diff --git a/lib/mobilizon/share.ex b/lib/mobilizon/share.ex
index a6408fd91..734628340 100644
--- a/lib/mobilizon/share.ex
+++ b/lib/mobilizon/share.ex
@@ -4,10 +4,12 @@ defmodule Mobilizon.Share do
   """
 
   use Ecto.Schema
+
   import Ecto.Changeset
   import Ecto.Query
-  alias Mobilizon.Storage.Repo
+
   alias Mobilizon.Actors.Actor
+  alias Mobilizon.Storage.Repo
 
   @type t :: %__MODULE__{
           uri: String.t(),
diff --git a/lib/service/export/icalendar.ex b/lib/service/export/icalendar.ex
index 32ec1625e..cb5fad32a 100644
--- a/lib/service/export/icalendar.ex
+++ b/lib/service/export/icalendar.ex
@@ -5,8 +5,8 @@ defmodule Mobilizon.Service.Export.ICalendar do
 
   alias Mobilizon.{Actors, Events, Users}
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Events.{Event, FeedToken}
   alias Mobilizon.Addresses.Address
+  alias Mobilizon.Events.{Event, FeedToken}
   alias Mobilizon.Users.User
 
   @doc """
diff --git a/lib/service/geospatial/addok.ex b/lib/service/geospatial/addok.ex
index 8428973b9..ab4111746 100644
--- a/lib/service/geospatial/addok.ex
+++ b/lib/service/geospatial/addok.ex
@@ -4,8 +4,8 @@ defmodule Mobilizon.Service.Geospatial.Addok do
   """
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Provider
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Provider
 
   require Logger
 
diff --git a/lib/service/geospatial/map_quest.ex b/lib/service/geospatial/map_quest.ex
index 5f567224d..838d1ce87 100644
--- a/lib/service/geospatial/map_quest.ex
+++ b/lib/service/geospatial/map_quest.ex
@@ -10,8 +10,8 @@ defmodule Mobilizon.Service.Geospatial.MapQuest do
   """
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Provider
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Provider
 
   require Logger
 
diff --git a/lib/service/geospatial/mimirsbrunn.ex b/lib/service/geospatial/mimirsbrunn.ex
index cb4156bd1..8449aa129 100644
--- a/lib/service/geospatial/mimirsbrunn.ex
+++ b/lib/service/geospatial/mimirsbrunn.ex
@@ -8,8 +8,8 @@ defmodule Mobilizon.Service.Geospatial.Mimirsbrunn do
   """
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Provider
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Provider
 
   require Logger
 
diff --git a/lib/service/geospatial/nominatim.ex b/lib/service/geospatial/nominatim.ex
index f9953c082..58b4bed3d 100644
--- a/lib/service/geospatial/nominatim.ex
+++ b/lib/service/geospatial/nominatim.ex
@@ -4,8 +4,8 @@ defmodule Mobilizon.Service.Geospatial.Nominatim do
   """
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Provider
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Provider
 
   require Logger
 
diff --git a/lib/service/geospatial/pelias.ex b/lib/service/geospatial/pelias.ex
index 386b7d1fb..12603a232 100644
--- a/lib/service/geospatial/pelias.ex
+++ b/lib/service/geospatial/pelias.ex
@@ -6,8 +6,8 @@ defmodule Mobilizon.Service.Geospatial.Pelias do
   """
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Provider
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Provider
 
   require Logger
 
diff --git a/lib/service/geospatial/photon.ex b/lib/service/geospatial/photon.ex
index 364a6c147..7b9e66fbc 100644
--- a/lib/service/geospatial/photon.ex
+++ b/lib/service/geospatial/photon.ex
@@ -4,8 +4,8 @@ defmodule Mobilizon.Service.Geospatial.Photon do
   """
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Provider
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Provider
 
   require Logger
 
diff --git a/lib/service/metadata/instance.ex b/lib/service/metadata/instance.ex
index a6b71efcf..cfa15f9da 100644
--- a/lib/service/metadata/instance.ex
+++ b/lib/service/metadata/instance.ex
@@ -5,10 +5,11 @@ defmodule Mobilizon.Service.Metadata.Instance do
 
   alias Phoenix.HTML
   alias Phoenix.HTML.Tag
+
   alias Mobilizon.Config
   alias Mobilizon.Web.Endpoint
 
-  def build_tags() do
+  def build_tags do
     description = process_description(Config.instance_description())
     title = "#{Config.instance_name()} - Mobilizon"
 
diff --git a/lib/service/workers/build_search.ex b/lib/service/workers/build_search.ex
index 21a4bce8d..184f5ad39 100644
--- a/lib/service/workers/build_search.ex
+++ b/lib/service/workers/build_search.ex
@@ -3,10 +3,11 @@ defmodule Mobilizon.Service.Workers.BuildSearch do
   Worker to build search results
   """
 
+  alias Ecto.Adapters.SQL
+
   alias Mobilizon.Events
   alias Mobilizon.Events.Event
   alias Mobilizon.Storage.Repo
-  alias Ecto.Adapters.SQL
 
   use Mobilizon.Service.Workers.Helper, queue: "search"
 
diff --git a/lib/web/email/checker.ex b/lib/web/email/checker.ex
index 9a2aec50f..e99fbcd64 100644
--- a/lib/web/email/checker.ex
+++ b/lib/web/email/checker.ex
@@ -3,8 +3,7 @@ defmodule Mobilizon.Web.Email.Checker do
   Provides a function to test emails against a "not so bad" regex.
   """
 
-  # TODO: simplify me!
-  @email_regex ~r/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  @email_regex ~r/^[\w.!#$%&’*+\-\/=?\^`{|}~]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$/i
 
   @doc """
   Returns whether the email is valid.
diff --git a/lib/web/email/event.ex b/lib/web/email/event.ex
index ee069b564..e1ae50eb1 100644
--- a/lib/web/email/event.ex
+++ b/lib/web/email/event.ex
@@ -15,7 +15,7 @@ defmodule Mobilizon.Web.Email.Event do
   alias Mobilizon.Storage.Repo
   alias Mobilizon.Users.User
 
-  alias Mobilizon.Web.{Gettext, Email}
+  alias Mobilizon.Web.{Email, Gettext}
 
   @important_changes [:title, :begins_on, :ends_on, :status]
 
diff --git a/lib/web/email/participation.ex b/lib/web/email/participation.ex
index 83464dd2c..5bf7d7e83 100644
--- a/lib/web/email/participation.ex
+++ b/lib/web/email/participation.ex
@@ -9,9 +9,9 @@ defmodule Mobilizon.Web.Email.Participation do
 
   import Mobilizon.Web.Gettext
 
-  alias Mobilizon.Users.User
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Events.Participant
+  alias Mobilizon.Users.User
 
   alias Mobilizon.Web.{Email, Gettext}
 
diff --git a/lib/web/views/error_view.ex b/lib/web/views/error_view.ex
index 848b8aa0d..f5ad17bd6 100644
--- a/lib/web/views/error_view.ex
+++ b/lib/web/views/error_view.ex
@@ -49,7 +49,7 @@ defmodule Mobilizon.Web.ErrorView do
     render("500.html", assigns)
   end
 
-  defp index_file_path() do
+  defp index_file_path do
     Path.join(Application.app_dir(:mobilizon, "priv/static"), "index.html")
   end
 end
diff --git a/test/graphql/resolvers/admin_test.exs b/test/graphql/resolvers/admin_test.exs
index e8a1c699d..affb40fb1 100644
--- a/test/graphql/resolvers/admin_test.exs
+++ b/test/graphql/resolvers/admin_test.exs
@@ -10,8 +10,7 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
 
   alias Mobilizon.Federation.ActivityPub.Relay
 
-  alias Mobilizon.GraphQL.API
-  alias Mobilizon.GraphQL.AbsintheHelpers
+  alias Mobilizon.GraphQL.{AbsintheHelpers, API}
 
   describe "Resolver: List the action logs" do
     @note_content "This a note on a report"
diff --git a/test/mobilizon/actors/actors_test.exs b/test/mobilizon/actors/actors_test.exs
index 2a2db0921..820eb1c7c 100644
--- a/test/mobilizon/actors/actors_test.exs
+++ b/test/mobilizon/actors/actors_test.exs
@@ -5,9 +5,9 @@ defmodule Mobilizon.ActorsTest do
 
   import Mobilizon.Factory
 
-  alias Mobilizon.{Actors, Config, Users, Events, Tombstone}
+  alias Mobilizon.{Actors, Config, Events, Tombstone, Users}
   alias Mobilizon.Actors.{Actor, Bot, Follower, Member}
-  alias Mobilizon.Events.{Event, Comment}
+  alias Mobilizon.Events.{Comment, Event}
   alias Mobilizon.Media.File, as: FileModel
   alias Mobilizon.Service.Workers
   alias Mobilizon.Storage.Page
diff --git a/test/service/export/icalendar_test.exs b/test/service/export/icalendar_test.exs
index aae737b63..94c170654 100644
--- a/test/service/export/icalendar_test.exs
+++ b/test/service/export/icalendar_test.exs
@@ -1,12 +1,14 @@
 defmodule Mobilizon.Service.ICalendarTest do
-  alias Mobilizon.Service.Export.ICalendar, as: ICalendarService
-  alias Mobilizon.Events.Event
-  alias Mobilizon.Addresses.Address
-  alias ICalendar.Value
   use Mobilizon.DataCase
 
   import Mobilizon.Factory
 
+  alias ICalendar.Value
+
+  alias Mobilizon.Addresses.Address
+  alias Mobilizon.Events.Event
+  alias Mobilizon.Service.Export.ICalendar, as: ICalendarService
+
   describe "export an event to ics" do
     test "export basic infos" do
       %Event{} = event = insert(:event)
diff --git a/test/service/geospatial/addok_test.exs b/test/service/geospatial/addok_test.exs
index 7dbf948dc..8680c65bb 100644
--- a/test/service/geospatial/addok_test.exs
+++ b/test/service/geospatial/addok_test.exs
@@ -6,8 +6,8 @@ defmodule Mobilizon.Service.Geospatial.AddokTest do
   import Mock
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Addok
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Addok
 
   @httpoison_headers [
     {"User-Agent",
diff --git a/test/service/geospatial/map_quest_test.exs b/test/service/geospatial/map_quest_test.exs
index 00d535cae..2aeb7c016 100644
--- a/test/service/geospatial/map_quest_test.exs
+++ b/test/service/geospatial/map_quest_test.exs
@@ -6,8 +6,8 @@ defmodule Mobilizon.Service.Geospatial.MapQuestTest do
   import Mock
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.MapQuest
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.MapQuest
 
   @httpoison_headers [
     {"User-Agent",
diff --git a/test/service/geospatial/nominatim_test.exs b/test/service/geospatial/nominatim_test.exs
index b64bcb935..eeb4dbb51 100644
--- a/test/service/geospatial/nominatim_test.exs
+++ b/test/service/geospatial/nominatim_test.exs
@@ -6,8 +6,8 @@ defmodule Mobilizon.Service.Geospatial.NominatimTest do
   import Mock
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Nominatim
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Nominatim
 
   @httpoison_headers [
     {"User-Agent",
diff --git a/test/service/geospatial/photon_test.exs b/test/service/geospatial/photon_test.exs
index 009bccdb4..8154f37c3 100644
--- a/test/service/geospatial/photon_test.exs
+++ b/test/service/geospatial/photon_test.exs
@@ -6,8 +6,8 @@ defmodule Mobilizon.Service.Geospatial.PhotonTest do
   import Mock
 
   alias Mobilizon.Addresses.Address
-  alias Mobilizon.Service.Geospatial.Photon
   alias Mobilizon.Config
+  alias Mobilizon.Service.Geospatial.Photon
 
   @httpoison_headers [
     {"User-Agent",
diff --git a/test/tasks/actors_test.exs b/test/tasks/actors_test.exs
index 05fc460c0..a67c69468 100644
--- a/test/tasks/actors_test.exs
+++ b/test/tasks/actors_test.exs
@@ -1,10 +1,12 @@
 defmodule Mix.Tasks.Mobilizon.ActorsTest do
   use Mobilizon.DataCase
 
-  alias Mobilizon.Actors.Actor
-  alias Mix.Tasks.Mobilizon.Actors.Show
   import Mobilizon.Factory
 
+  alias Mix.Tasks.Mobilizon.Actors.Show
+
+  alias Mobilizon.Actors.Actor
+
   Mix.shell(Mix.Shell.Process)
 
   @username "someone"
diff --git a/test/tasks/users_test.exs b/test/tasks/users_test.exs
index d5165405f..7b537b98c 100644
--- a/test/tasks/users_test.exs
+++ b/test/tasks/users_test.exs
@@ -3,9 +3,10 @@ defmodule Mix.Tasks.Mobilizon.UsersTest do
 
   import Mobilizon.Factory
 
+  alias Mix.Tasks.Mobilizon.Users.{Delete, Modify, New, Show}
+
   alias Mobilizon.Users
   alias Mobilizon.Users.User
-  alias Mix.Tasks.Mobilizon.Users.{New, Delete, Show, Modify}
 
   Mix.shell(Mix.Shell.Process)
 
diff --git a/test/web/views/error_view_test.exs b/test/web/views/error_view_test.exs
index 7a4656f4e..66920509c 100644
--- a/test/web/views/error_view_test.exs
+++ b/test/web/views/error_view_test.exs
@@ -4,16 +4,18 @@ defmodule Mobilizon.Web.ErrorViewTest do
   # Bring render/3 and render_to_string/3 for testing custom views
   import Phoenix.View
 
+  alias Mobilizon.Web.ErrorView
+
   test "renders 404.html" do
-    assert render_to_string(Mobilizon.Web.ErrorView, "404.html", []) =~
+    assert render_to_string(ErrorView, "404.html", []) =~
              "We're sorry but mobilizon doesn't work properly without JavaScript enabled. Please enable it to continue."
   end
 
   test "render 500.html" do
-    assert render_to_string(Mobilizon.Web.ErrorView, "500.html", []) == "Internal server error"
+    assert render_to_string(ErrorView, "500.html", []) == "Internal server error"
   end
 
   test "render any other" do
-    assert render_to_string(Mobilizon.Web.ErrorView, "505.html", []) == "Internal server error"
+    assert render_to_string(ErrorView, "505.html", []) == "Internal server error"
   end
 end