diff --git a/ledger/src/builtins.rs b/ledger/src/builtins.rs
index d002d9126d7eb6..16a55e4bcaabef 100644
--- a/ledger/src/builtins.rs
+++ b/ledger/src/builtins.rs
@@ -12,6 +12,12 @@ macro_rules! to_builtin {
 
 /// Builtin programs that are always available
 fn genesis_builtins(bpf_jit: bool) -> Vec<Builtin> {
+    // Currently JIT is not supported on the BPF VM:
+    // !x86_64: https://github.com/qmonnet/rbpf/issues/48
+    // Windows: https://github.com/solana-labs/rbpf/issues/217
+    #[cfg(any(not(target_arch = "x86_64"), target_family = "windows"))]
+    let bpf_jit = false;
+
     vec![
         to_builtin!(solana_bpf_loader_deprecated_program!()),
         if bpf_jit {
diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs
index 24ababbd19e77b..4b00c0102adeaf 100644
--- a/validator/src/bin/solana-test-validator.rs
+++ b/validator/src/bin/solana-test-validator.rs
@@ -392,11 +392,6 @@ fn main() {
         IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
         faucet_port,
     ));
-    // JIT not supported on the BPF VM in Windows currently: https://github.com/solana-labs/rbpf/issues/217
-    #[cfg(target_family = "windows")]
-    let bpf_jit = false;
-    #[cfg(not(target_family = "windows"))]
-    let bpf_jit = !matches.is_present("no_bpf_jit");
 
     let mut programs = vec![];
     if let Some(values) = matches.values_of("bpf_program") {
@@ -550,7 +545,7 @@ fn main() {
             faucet_addr,
             ..JsonRpcConfig::default()
         })
-        .bpf_jit(bpf_jit)
+        .bpf_jit(!matches.is_present("no_bpf_jit"))
         .rpc_port(rpc_port)
         .add_programs_with_path(&programs);