diff --git a/bin/docs/Forester_docs.ml b/bin/docs/Forester_docs.ml
index 1cc0582..074b620 100644
--- a/bin/docs/Forester_docs.ml
+++ b/bin/docs/Forester_docs.ml
@@ -9,7 +9,7 @@ module EP = Eio.Path
 let () = Logs.set_level (Some Debug)
 
 let () =
-  Logs.set_reporter (Logs_fmt.reporter ());
+  Logs.set_reporter (Log.reporter ());
   let@ env = Eio_main.run in
   let config = Config.(default ~url:docs_url) () in
   let forest = Forester.build_forest ~env ~config ~dev:false () in
diff --git a/lib/compiler/Build_latex.ml b/lib/compiler/Build_latex.ml
index 647d0b9..83b90c0 100644
--- a/lib/compiler/Build_latex.ml
+++ b/lib/compiler/Build_latex.ml
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *)
 
+open Forester_core
 open Result.Syntax
 
 type env = Eio_unix.Stdenv.base
@@ -19,7 +20,8 @@ let latex_to_svg ~env ~range source =
   Eio_util.ensure_context_of_path ~perm svg_path;
   try Ok (Eio.Path.load svg_path)
   with Eio.Io (Eio.Fs.E (Eio.Fs.Not_found _), _) ->
-    Logs.info (fun m -> m "Building %s" (Eio.Path.native_exn svg_path));
+    Logs.debug ~src:Log.Src.compiler (fun m ->
+        m "building %s" (Eio.Path.native_exn svg_path));
     let* svg_code = LaTeX_pipeline.latex_to_svg ~env ~range source in
     Eio.Path.save ~create:(`Or_truncate perm) svg_path svg_code;
     Ok svg_code
diff --git a/lib/compiler/test/Test_import_graph.ml b/lib/compiler/test/Test_import_graph.ml
index fa322b6..cbfeb36 100644
--- a/lib/compiler/test/Test_import_graph.ml
+++ b/lib/compiler/test/Test_import_graph.ml
@@ -74,7 +74,7 @@ let test_import_graph ~env () =
 let () =
   let@ env = Eio_main.run in
   Logs.set_level (Some Debug);
-  Logs.set_reporter (Logs_fmt.reporter ());
+  Logs.set_reporter (Log.reporter ());
   let open Alcotest in
   run "Import_graph"
     [
diff --git a/lib/frontend/Legacy_xml_client.ml b/lib/frontend/Legacy_xml_client.ml
index 625be25..472d77a 100644
--- a/lib/frontend/Legacy_xml_client.ml
+++ b/lib/frontend/Legacy_xml_client.ml
@@ -346,7 +346,8 @@ let render_article (forest : State.t) (article : T.content T.article) : P.node =
     let elapsed = after -. before in
     if elapsed > 0.1 then
       forest.log.debug ~src:Log.Src.frontend (fun m ->
-          m "rendering %a took %f seconds" Format.(pp_print_option URI.pp)
+          m "rendering %a took %f seconds"
+            Format.(pp_print_option URI.pp)
             article.frontmatter.uri elapsed);
     result
   in
diff --git a/lib/frontend/test/Test_config.ml b/lib/frontend/test/Test_config.ml
index 413c765..88513ea 100644
--- a/lib/frontend/test/Test_config.ml
+++ b/lib/frontend/test/Test_config.ml
@@ -68,7 +68,7 @@ let test_uninterpreted_fields () = ()
 let () =
   let open Alcotest in
   Logs.set_level (Some Debug);
-  Logs.set_reporter (Logs.format_reporter ());
+  Logs.set_reporter (Log.reporter ());
   run "Config parsing"
     [
       ( "example config works",
diff --git a/lib/frontend/test/Test_router.ml b/lib/frontend/test/Test_router.ml
index 9ae7fd3..fbdf39f 100644
--- a/lib/frontend/test/Test_router.ml
+++ b/lib/frontend/test/Test_router.ml
@@ -13,7 +13,7 @@ module EP = Eio.Path
 
 let () =
   Logs.set_level (Some Debug);
-  Logs.set_reporter (Logs.format_reporter ())
+  Logs.set_reporter (Log.reporter ())
 
 let scope_t = A.testable Router.pp_scope ( = )
 
@@ -100,8 +100,6 @@ let () =
     let uri = mk_uri "http://forest.foreign/foo" in
     let scope = Router.scope ~forest uri in
     let routed = Router.Server.route ~forest uri in
-    Logs.debug (fun m -> m "hosts in %a:" URI.pp forest.config.url);
-    Hashtbl.iter (fun h _ -> Logs.debug (fun m -> m "%s" h)) forest.hosts;
     A.(check bool "" true (Hashtbl.mem forest.hosts "forest.foreign"));
     A.(check scope_t "" (Foreign "forest.foreign") scope);
     A.(check string "" "/trees/foreign/forest.foreign/foo" routed)
diff --git a/lib/language_server/Completion.ml b/lib/language_server/Completion.ml
index f5167e5..df0a90d 100644
--- a/lib/language_server/Completion.ml
+++ b/lib/language_server/Completion.ml
@@ -129,8 +129,10 @@ let completion_types (t : Tree.t) ~position =
   let syn_opt = Tree.syn t in
   let doc_opt = Tree.document t in
   let text_context = Option.bind doc_opt @@ Analysis.word_before ~position in
-  Logs.debug (fun m ->
-      m "Text_context: %a" Format.(pp_print_option pp_print_string) text_context);
+  Logs.debug ~src:Log.Src.lsp (fun m ->
+      m "text context before cursor: %a"
+        Format.(pp_print_option pp_print_string)
+        text_context);
   let code_context =
     let enclosing_group = Analysis.get_enclosing_code_group in
     let position =
@@ -327,8 +329,8 @@ let date_completions () : L.CompletionItem.t list =
 
 let compute
     ({context; position; textDocument = {uri}; _} : L.CompletionParams.t) : _ =
-  Logs.debug (fun m ->
-      m "when computing completions for %s" (Lsp.Uri.to_string uri));
+  Logs.debug ~src:Log.Src.lsp (fun m ->
+      m "computing completions for %s" (Lsp.Uri.to_string uri));
   let _triggerCharacter =
     match context with
     | Some {triggerCharacter; _} -> triggerCharacter
@@ -350,5 +352,6 @@ let compute
     | Visible -> visible_completions ~forest ~position @@ Tree.Parsed.nodes code
     | Date -> date_completions ()
   in
-  Logs.debug (fun m -> m "items: %d" (List.length items));
+  Logs.debug ~src:Log.Src.lsp (fun m ->
+      m "found %d completion items" (List.length items));
   Some (`CompletionList (L.CompletionList.create ~isIncomplete:false ~items ()))
diff --git a/lib/language_server/Workspace_symbols.ml b/lib/language_server/Workspace_symbols.ml
index 4458ab7..84c3372 100644
--- a/lib/language_server/Workspace_symbols.ml
+++ b/lib/language_server/Workspace_symbols.ml
@@ -94,7 +94,8 @@ let fuzzy_match ~pattern text =
 (* We no longer show exported functions, as this is really gumming up the editor
    interfaces. *)
 let compute (params : L.WorkspaceSymbolParams.t) : _ =
-  Logs.debug (fun m -> m "QUERY: %s" params.query);
+  Logs.debug ~src:Log.Src.lsp (fun m ->
+      m "computing workspace symbols for query %S" params.query);
   let Lsp_state.{forest; _} = Lsp_state.get () in
   let render = Plain_text_client.string_of_content ~forest in
   Option.some
diff --git a/test/Prelude.ml b/test/Prelude.ml
index 2e7511c..080f5a5 100644
--- a/test/Prelude.ml
+++ b/test/Prelude.ml
@@ -23,7 +23,7 @@ let with_open_tmp_dir ~env kont =
   let tmp = "_tmp" in
   Path.mkdirs ~exists_ok:true ~perm:0o755 Path.(cwd / tmp);
   let tmp_dir = Filename.temp_dir ~temp_dir:tmp ~perms:0o755 "" "" in
-  Logs.app (fun m -> m "%s" tmp_dir);
+  Logs.debug (fun m -> m "%s" tmp_dir);
   let tmp_path = Eio.Path.(cwd / tmp_dir) in
   let result = kont tmp_path in
   Path.rmtree ~missing_ok:true tmp_path;