diff --git a/infer/lib/python/inferlib/analyze.py b/infer/lib/python/inferlib/analyze.py
index e1875c76e..dd6c2c950 100644
--- a/infer/lib/python/inferlib/analyze.py
+++ b/infer/lib/python/inferlib/analyze.py
@@ -444,6 +444,10 @@ class Infer:
         elif self.args.project_root:
             infer_options += ['-project_root', self.args.project_root]
 
+        if self.args.analyzer in [config.ANALYZER_CHECKERS,
+                                  config.ANALYZER_TRACING]:
+            os.environ['INFER_ONDEMAND'] = 'Y'
+
         os.environ['INFER_OPTIONS'] = ' '.join(infer_options)
 
         if self.args.multicore == 1:
diff --git a/infer/src/backend/ondemand.ml b/infer/src/backend/ondemand.ml
index e4fb58831..7b6feaf3c 100644
--- a/infer/src/backend/ondemand.ml
+++ b/infer/src/backend/ondemand.ml
@@ -15,8 +15,8 @@ module F = Format
 let trace () = Config.from_env_variable "INFER_TRACE_ONDEMAND"
 let one_cluster_per_procedure () = false
 
-let () =
-  Config.ondemand_enabled := true
+let () = Config.ondemand_enabled :=
+    Config.from_env_variable "INFER_ONDEMAND"
 
 let across_files () = true