diff --git a/include/swift/Basic/LangOptions.h b/include/swift/Basic/LangOptions.h
index 77153d682f496..03aadf7600f4a 100644
--- a/include/swift/Basic/LangOptions.h
+++ b/include/swift/Basic/LangOptions.h
@@ -88,7 +88,8 @@ namespace swift {
     bool DisableAvailabilityChecking = false;
 
     /// Maximum number of typo corrections we are allowed to perform.
-    unsigned TypoCorrectionLimit = 10;
+    /// This is disabled by default until we can get typo-correction working within acceptable performance bounds.
+    unsigned TypoCorrectionLimit = 0;
     
     /// Should access control be respected?
     bool EnableAccessControl = true;
diff --git a/test/SourceKit/Sema/sema_symlink.swift.response b/test/SourceKit/Sema/sema_symlink.swift.response
index 87aebf74e748e..2eb4a74dd7016 100644
--- a/test/SourceKit/Sema/sema_symlink.swift.response
+++ b/test/SourceKit/Sema/sema_symlink.swift.response
@@ -12,29 +12,13 @@
     key.column: 16,
     key.filepath: real.swift,
     key.severity: source.diagnostic.severity.error,
-    key.description: "use of unresolved identifier 'goo'; did you mean 'Bool'?",
+    key.description: "use of unresolved identifier 'goo'",
     key.diagnostic_stage: source.diagnostic.stage.swift.sema,
     key.ranges: [
       {
         key.offset: 15,
         key.length: 3
       }
-    ],
-    key.fixits: [
-      {
-        key.offset: 15,
-        key.length: 3,
-        key.sourcetext: "Bool"
-      }
-    ],
-    key.diagnostics: [
-      {
-        key.line: 1,
-        key.column: 16,
-        key.filepath: real.swift,
-        key.severity: source.diagnostic.severity.note,
-        key.description: "'Bool' declared here (Swift.Bool)"
-      }
     ]
   }
 ]
diff --git a/test/lit.cfg b/test/lit.cfg
index b961be67dfc4a..ec6af2185b293 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -1175,6 +1175,10 @@ else:
     lit_config.fatal("Don't know how to define target_run and "
                      "target_build_swift for platform " + config.variant_triple)
 
+# Enable typo-correction for testing purposes.
+config.target_swift_frontend += " -typo-correction-limit 10 "
+subst_target_swift_frontend_mock_sdk += " -typo-correction-limit 10 "
+
 config.substitutions.append(('%module-target-triple',
                              target_specific_module_triple))