diff --git a/test/support/mock_server_case.ex b/test/support/mock_server_case.ex
index fa9df01..0655bf5 100644
--- a/test/support/mock_server_case.ex
+++ b/test/support/mock_server_case.ex
@@ -45,11 +45,10 @@ defmodule Mimicry.MockServerCase do
 
     if file_name do
       :ok = clear_servers()
-      {:ok, server_pid} = add_server(file_name)
+      {:ok, _server_pid} = add_server(file_name)
 
-      on_exit(fn ->
-        MockServerList.delete_server(server_pid)
-      end)
+      # make sure server is cleared afterwards
+      on_exit(&clear_servers/0)
     end
 
     :ok