diff --git a/test/oban/tower_oban_test.exs b/test/tower/tower_oban_test.exs
similarity index 93%
rename from test/oban/tower_oban_test.exs
rename to test/tower/tower_oban_test.exs
index 0a93f42..512b3b8 100644
--- a/test/oban/tower_oban_test.exs
+++ b/test/tower/tower_oban_test.exs
@@ -4,8 +4,6 @@ defmodule TowerObanTest do
 
   use AssertEventually, timeout: 100, interval: 10
 
-  import ExUnit.CaptureLog, only: [capture_log: 1]
-
   setup do
     start_link_supervised!(Tower.EphemeralReporter)
 
@@ -18,9 +16,7 @@ defmodule TowerObanTest do
       {Oban, engine: Oban.Engines.Lite, repo: TestApp.Repo, queues: [default: 10]}
     )
 
-    capture_log(fn ->
-      Ecto.Migrator.up(TestApp.Repo, 0, TestApp.Repo.Migrations.AddOban)
-    end)
+    Ecto.Migrator.up(TestApp.Repo, 0, TestApp.Repo.Migrations.AddOban)
 
     Tower.attach()
 
@@ -29,6 +25,7 @@ defmodule TowerObanTest do
     end)
   end
 
+  @tag capture_log: true
   test "reports raised exception in an Oban worker" do
     TestApp.ArithmeticErrorWorker.new(%{}, max_attempts: 1)
     |> Oban.insert()
@@ -51,6 +48,7 @@ defmodule TowerObanTest do
     assert is_list(stacktrace)
   end
 
+  @tag capture_log: true
   test "reports uncaught throw generated in an Oban worker" do
     TestApp.UncaughtThrowWorker.new(%{}, max_attempts: 1)
     |> Oban.insert()
@@ -73,6 +71,7 @@ defmodule TowerObanTest do
     assert is_list(stacktrace)
   end
 
+  @tag capture_log: true
   test "reports abnormal exit generated in an Oban worker" do
     TestApp.AbnormalExitWorker.new(%{}, max_attempts: 1)
     |> Oban.insert()
diff --git a/test/plug/tower_plug_test.exs b/test/tower/tower_plug_test.exs
similarity index 100%
rename from test/plug/tower_plug_test.exs
rename to test/tower/tower_plug_test.exs