diff --git a/cranelift/codegen/meta/src/shared/settings.rs b/cranelift/codegen/meta/src/shared/settings.rs
index 6e3af70623..6b8b7a017f 100644
--- a/cranelift/codegen/meta/src/shared/settings.rs
+++ b/cranelift/codegen/meta/src/shared/settings.rs
@@ -84,7 +84,7 @@ pub fn define() -> SettingGroup {
         false,
     );
 
-    settings.add_bool("enable_simd", "Enable the use of SIMD instructions.", true);
+    settings.add_bool("enable_simd", "Enable the use of SIMD instructions.", false);
 
     settings.add_bool(
         "enable_atomics",
diff --git a/cranelift/codegen/src/isa/riscv/settings.rs b/cranelift/codegen/src/isa/riscv/settings.rs
index 3599a93495..24c0e2af11 100644
--- a/cranelift/codegen/src/isa/riscv/settings.rs
+++ b/cranelift/codegen/src/isa/riscv/settings.rs
@@ -35,7 +35,9 @@ mod tests {
 
     #[test]
     fn predicates() {
-        let shared = settings::Flags::new(settings::builder());
+        let mut sb = settings::builder();
+        sb.set("enable_simd", "true").unwrap();
+        let shared = settings::Flags::new(sb);
         let mut b = builder();
         b.enable("supports_f").unwrap();
         b.enable("supports_d").unwrap();
diff --git a/cranelift/codegen/src/settings.rs b/cranelift/codegen/src/settings.rs
index 836b47a5f6..b93e3d7149 100644
--- a/cranelift/codegen/src/settings.rs
+++ b/cranelift/codegen/src/settings.rs
@@ -387,7 +387,7 @@ mod tests {
              avoid_div_traps = false\n\
              enable_float = true\n\
              enable_nan_canonicalization = false\n\
-             enable_simd = true\n\
+             enable_simd = false\n\
              enable_atomics = true\n\
              allones_funcaddrs = false\n\
              probestack_enabled = true\n\
@@ -395,7 +395,7 @@ mod tests {
              jump_tables_enabled = true\n"
         );
         assert_eq!(f.opt_level(), super::OptLevel::Default);
-        assert_eq!(f.enable_simd(), true);
+        assert_eq!(f.enable_simd(), false);
         assert_eq!(f.baldrdash_prologue_words(), 0);
     }
 
diff --git a/cranelift/filetests/filetests/isa/x86/binary32-float.clif b/cranelift/filetests/filetests/isa/x86/binary32-float.clif
index 8a4ae5fe7e..c6092e2e22 100644
--- a/cranelift/filetests/filetests/isa/x86/binary32-float.clif
+++ b/cranelift/filetests/filetests/isa/x86/binary32-float.clif
@@ -1,5 +1,6 @@
 ; Binary emission of 32-bit floating point code.
 test binemit
+set enable_simd
 target i686 haswell
 
 ; The binary encodings can be verified with the command:
diff --git a/cranelift/filetests/filetests/isa/x86/binary64-float.clif b/cranelift/filetests/filetests/isa/x86/binary64-float.clif
index 59e024a042..8c34299705 100644
--- a/cranelift/filetests/filetests/isa/x86/binary64-float.clif
+++ b/cranelift/filetests/filetests/isa/x86/binary64-float.clif
@@ -1,6 +1,7 @@
 ; Binary emission of 64-bit floating point code.
 test binemit
 set opt_level=best
+set enable_simd
 target x86_64 haswell
 
 ; The binary encodings can be verified with the command: