diff --git a/Frameworks/buffer/tests/t_buffer.mm b/Frameworks/buffer/tests/t_buffer.mm
index ee42056b..fe3f0caa 100644
--- a/Frameworks/buffer/tests/t_buffer.mm
+++ b/Frameworks/buffer/tests/t_buffer.mm
@@ -23,7 +23,8 @@ void setup_fixtures ()
 	bundleIndex.commit();
 
 	NSApplicationLoad();
-	[NSSpellChecker sharedSpellChecker];
+	NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
+	spellChecker.automaticallyIdentifiesLanguages = NO;
 }
 
 void benchmark_insert_50_mb ()
diff --git a/Frameworks/ns/src/spellcheck.mm b/Frameworks/ns/src/spellcheck.mm
index 9b67ac90..695a1d69 100644
--- a/Frameworks/ns/src/spellcheck.mm
+++ b/Frameworks/ns/src/spellcheck.mm
@@ -35,7 +35,7 @@ namespace ns
 	_OutputIter spellcheck (char const* first, char const* last, std::string const& language, long int tag, size_t offset, _OutputIter out)
 	{
 		NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
-		NSString* lang               = [NSString stringWithCxxString:language];
+		NSString* lang               = spellChecker.automaticallyIdentifiesLanguages ? nil : [NSString stringWithCxxString:language];
 		NSString* str                = [NSString stringWithUTF8String:first length:last - first];
 		NSRange range                = [spellChecker checkSpellingOfString:str startingAt:0 language:lang wrap:NO inSpellDocumentWithTag:tag wordCount:NULL];
 
diff --git a/Frameworks/ns/tests/t_spellcheck.mm b/Frameworks/ns/tests/t_spellcheck.mm
index 367d82c7..fdffdb2a 100644
--- a/Frameworks/ns/tests/t_spellcheck.mm
+++ b/Frameworks/ns/tests/t_spellcheck.mm
@@ -4,7 +4,8 @@
 void setup ()
 {
 	NSApplicationLoad();
-	[NSSpellChecker sharedSpellChecker];
+	NSSpellChecker* spellChecker = [NSSpellChecker sharedSpellChecker];
+	spellChecker.automaticallyIdentifiesLanguages = NO;
 }
 
 void test_spellcheck ()