diff --git a/test/philomena_web/controllers/deactivation_controller_test.exs b/test/philomena_web/controllers/deactivation_controller_test.exs
index 37692532..fccbf688 100644
--- a/test/philomena_web/controllers/deactivation_controller_test.exs
+++ b/test/philomena_web/controllers/deactivation_controller_test.exs
@@ -20,7 +20,7 @@ defmodule PhilomenaWeb.DeactivationControllerTest do
       assert redirected_to(conn) == ~p"/"
       conn = get(conn, ~p"/registrations/edit")
       assert redirected_to(conn) == ~p"/sessions/new"
-      assert Memory.all() |> Enum.count() == 1
+      assert Memory.all() |> Enum.find(&(&1.subject == "Reactivation instructions for your account")) != nil
 
       user = Users.get_user!(user.id)
       assert user.deleted_by_user_id == user.id
diff --git a/test/philomena_web/controllers/reactivation_controller_test.exs b/test/philomena_web/controllers/reactivation_controller_test.exs
index 13c4e9da..f59f5114 100644
--- a/test/philomena_web/controllers/reactivation_controller_test.exs
+++ b/test/philomena_web/controllers/reactivation_controller_test.exs
@@ -18,7 +18,8 @@ defmodule PhilomenaWeb.ReactivationControllerTest do
   describe "POST /reactivations/:id" do
     test "reactivate account page works", %{conn: conn, user: user} do
       conn = delete(conn, ~p"/deactivations")
-      reactivation_link = Memory.all() |> hd |> extract_reactivation_link_from_email
+      reactivation_link = Memory.all() |> Enum.find(&(&1.subject == "Reactivation instructions for your account")) |> extract_reactivation_link_from_email()
+      assert reactivation_link != nil
       conn = post(conn, reactivation_link)
       assert redirected_to(conn) == ~p"/"