diff --git a/lib/mix/tasks/pleroma/ecto/ecto.ex b/lib/mix/tasks/pleroma/ecto.ex
similarity index 100%
rename from lib/mix/tasks/pleroma/ecto/ecto.ex
rename to lib/mix/tasks/pleroma/ecto.ex
diff --git a/lib/mix/tasks/pleroma/robotstxt.ex b/lib/mix/tasks/pleroma/robots_txt.ex
similarity index 100%
rename from lib/mix/tasks/pleroma/robotstxt.ex
rename to lib/mix/tasks/pleroma/robots_txt.ex
diff --git a/test/tasks/pleroma_test.exs b/test/mix/pleroma_test.exs
similarity index 100%
rename from test/tasks/pleroma_test.exs
rename to test/mix/pleroma_test.exs
diff --git a/test/tasks/app_test.exs b/test/mix/tasks/pleroma/app_test.exs
similarity index 100%
rename from test/tasks/app_test.exs
rename to test/mix/tasks/pleroma/app_test.exs
diff --git a/test/tasks/config_test.exs b/test/mix/tasks/pleroma/config_test.exs
similarity index 100%
rename from test/tasks/config_test.exs
rename to test/mix/tasks/pleroma/config_test.exs
diff --git a/test/tasks/count_statuses_test.exs b/test/mix/tasks/pleroma/count_statuses_test.exs
similarity index 100%
rename from test/tasks/count_statuses_test.exs
rename to test/mix/tasks/pleroma/count_statuses_test.exs
diff --git a/test/tasks/database_test.exs b/test/mix/tasks/pleroma/database_test.exs
similarity index 100%
rename from test/tasks/database_test.exs
rename to test/mix/tasks/pleroma/database_test.exs
diff --git a/test/tasks/digest_test.exs b/test/mix/tasks/pleroma/digest_test.exs
similarity index 100%
rename from test/tasks/digest_test.exs
rename to test/mix/tasks/pleroma/digest_test.exs
diff --git a/test/tasks/ecto/migrate_test.exs b/test/mix/tasks/pleroma/ecto/migrate_test.exs
similarity index 100%
rename from test/tasks/ecto/migrate_test.exs
rename to test/mix/tasks/pleroma/ecto/migrate_test.exs
diff --git a/test/tasks/ecto/rollback_test.exs b/test/mix/tasks/pleroma/ecto/rollback_test.exs
similarity index 100%
rename from test/tasks/ecto/rollback_test.exs
rename to test/mix/tasks/pleroma/ecto/rollback_test.exs
diff --git a/test/tasks/ecto/ecto_test.exs b/test/mix/tasks/pleroma/ecto_test.exs
similarity index 100%
rename from test/tasks/ecto/ecto_test.exs
rename to test/mix/tasks/pleroma/ecto_test.exs
diff --git a/test/tasks/email_test.exs b/test/mix/tasks/pleroma/email_test.exs
similarity index 100%
rename from test/tasks/email_test.exs
rename to test/mix/tasks/pleroma/email_test.exs
diff --git a/test/tasks/emoji_test.exs b/test/mix/tasks/pleroma/emoji_test.exs
similarity index 100%
rename from test/tasks/emoji_test.exs
rename to test/mix/tasks/pleroma/emoji_test.exs
diff --git a/test/tasks/frontend_test.exs b/test/mix/tasks/pleroma/frontend_test.exs
similarity index 100%
rename from test/tasks/frontend_test.exs
rename to test/mix/tasks/pleroma/frontend_test.exs
diff --git a/test/tasks/instance_test.exs b/test/mix/tasks/pleroma/instance_test.exs
similarity index 98%
rename from test/tasks/instance_test.exs
rename to test/mix/tasks/pleroma/instance_test.exs
index 914ccb10a..8a02710ee 100644
--- a/test/tasks/instance_test.exs
+++ b/test/mix/tasks/pleroma/instance_test.exs
@@ -2,7 +2,7 @@
 # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.InstanceTest do
+defmodule Mix.Tasks.Pleroma.InstanceTest do
   use ExUnit.Case
 
   setup do
diff --git a/test/tasks/refresh_counter_cache_test.exs b/test/mix/tasks/pleroma/refresh_counter_cache_test.exs
similarity index 100%
rename from test/tasks/refresh_counter_cache_test.exs
rename to test/mix/tasks/pleroma/refresh_counter_cache_test.exs
diff --git a/test/tasks/relay_test.exs b/test/mix/tasks/pleroma/relay_test.exs
similarity index 100%
rename from test/tasks/relay_test.exs
rename to test/mix/tasks/pleroma/relay_test.exs
diff --git a/test/tasks/robots_txt_test.exs b/test/mix/tasks/pleroma/robots_txt_test.exs
similarity index 100%
rename from test/tasks/robots_txt_test.exs
rename to test/mix/tasks/pleroma/robots_txt_test.exs
diff --git a/test/tasks/uploads_test.exs b/test/mix/tasks/pleroma/uploads_test.exs
similarity index 100%
rename from test/tasks/uploads_test.exs
rename to test/mix/tasks/pleroma/uploads_test.exs
diff --git a/test/tasks/user_test.exs b/test/mix/tasks/pleroma/user_test.exs
similarity index 100%
rename from test/tasks/user_test.exs
rename to test/mix/tasks/pleroma/user_test.exs