diff --git a/infer/src/checkers/registerCheckers.ml b/infer/src/checkers/registerCheckers.ml
index 146ab8cd9..c06949219 100644
--- a/infer/src/checkers/registerCheckers.ml
+++ b/infer/src/checkers/registerCheckers.ml
@@ -52,6 +52,7 @@ let active_procedure_checkers () =
         Checkers.callback_print_access_to_globals, false;
         ClangTaintAnalysis.checker, Config.quandary;
         Siof.checker, Config.siof;
+        ThreadSafety.analyze_procedure, Config.threadsafety;
         BufferOverrunChecker.checker, Config.bufferoverrun;
       ] in
     List.map ~f:(fun (x, y) -> (x, y, Some Config.Clang)) l in
diff --git a/infer/src/integration/Buck.ml b/infer/src/integration/Buck.ml
index 656e4f44a..0035dc7e6 100644
--- a/infer/src/integration/Buck.ml
+++ b/infer/src/integration/Buck.ml
@@ -51,10 +51,10 @@ let add_flavor_to_target target =
       target
   | None, (Linters | Capture) ->
       add "infer-capture-all"
-  | None, (Checkers | Infer) ->
+  | None, (Bufferoverrun | Checkers | Infer | Quandary | Siof | Threadsafety) ->
       add "infer"
-  | None, (Eradicate | Tracing | Crashcontext | Quandary | Siof | Threadsafety | Bufferoverrun) ->
-      failwithf "Unsupported infer analyzer with Buck flavors: %s"
+  | None, (Eradicate | Tracing | Crashcontext) ->
+      failwithf "Analyzer %s is Java-only; not supported with Buck flavors"
         (Config.string_of_analyzer Config.analyzer)
 
 let add_flavors_to_buck_command build_cmd =