diff --git a/test/plug/router_test.exs b/test/plug/router_test.exs
index 561a9836..423383f1 100644
--- a/test/plug/router_test.exs
+++ b/test/plug/router_test.exs
@@ -615,27 +615,29 @@ defmodule Plug.RouterTest do
   end
 
   test "ArgumentError is raised when match/3 is not given :to or :do option" do
-    assert_raise ArgumentError, fn ->
-      defmodule NoExpectedMatchOptions do
-        use Plug.Router
+    %{message: "expected one of :to or :do to be given as option"} =
+      catch_error(
+        defmodule NoExpectedMatchOptions do
+          use Plug.Router
 
-        plug :match
-        plug :dispatch
+          plug :match
+          plug :dispatch
 
-        match "/", foo: :bar
-      end
-    end
+          match "/", foo: :bar
+        end
+      )
   end
 
   test "RuntimeError is raised when no routes are defined" do
-    assert_raise RuntimeError, fn ->
-      defmodule NoRoutes do
-        use Plug.Router
-
-        plug :match
-        plug :dispatch
-      end
-    end
+    %{message: "no routes defined in module Plug.RouterTest.NoRoutes using Plug.Router"} =
+      catch_error(
+        defmodule NoRoutes do
+          use Plug.Router
+
+          plug :match
+          plug :dispatch
+        end
+      )
   end
 
   defp attach(handler_id, event) do