3 files changed, 20 insertions, 3 deletions
diff --git a/test/support/cluster.ex b/test/support/cluster.ex
index 1c923fb0c..25170163f 100644
--- a/test/support/cluster.ex
+++ b/test/support/cluster.ex
@@ -127,7 +127,10 @@ defmodule Pleroma.Cluster do
 
   defp start_slave({node_host, override_configs}) do
     log(node_host, "booting federated VM")
-    {:ok, node} = :slave.start(~c"127.0.0.1", node_name(node_host), vm_args())
+
+    {:ok, node} =
+      do_start_slave(%{host: "127.0.0.1", name: node_name(node_host), args: vm_args()})
+
     add_code_paths(node)
     load_apps_and_transfer_configuration(node, override_configs)
     ensure_apps_started(node)
@@ -219,4 +222,18 @@ defmodule Pleroma.Cluster do
     |> Enum.at(0)
     |> String.to_atom()
   end
+
+  if System.otp_release() >= "25" do
+    @peer :peer
+  else
+    @peer :slave
+  end
+
+  defp do_start_slave(%{host: host, name: name, args: args} = opts) do
+    if System.otp_release() >= "25" do
+      @peer.start(opts)
+    else
+      @peer.start(host, name, args)
+    end
+  end
 end
diff --git a/test/support/helpers.ex b/test/support/helpers.ex
index 0bd487f39..e3bfa73d2 100644
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@@ -41,7 +41,7 @@ defmodule Pleroma.Tests.Helpers do
     # NOTE: `clear_config([section, key], value)` != `clear_config([section], key: value)` (!)
     # Displaying a warning to prevent unintentional clearing of all but one keys in section
     if Keyword.keyword?(temp_setting) and length(temp_setting) == 1 do
-      Logger.warn(
+      Logger.warning(
         "Please change `clear_config([section], key: value)` to `clear_config([section, key], value)`"
       )
     end
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 78a367024..11cc2eb94 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -21,7 +21,7 @@ defmodule HttpRequestMock do
     else
       error ->
         with {:error, message} <- error do
-          Logger.warn(to_string(message))
+          Logger.warning(to_string(message))
         end
 
         {_, _r} = error