diff --git a/phpunit.xml b/phpunit.xml
index dbea76aa6..9434b710f 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -23,6 +23,7 @@
         <env name="APP_ENV" value="testing"/>
         <env name="APP_DEBUG" value="false"/>
         <env name="APP_LANG" value="en"/>
+        <env name="APP_AUTO_LANG_PUBLIC" value="true"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index c9d6ed6f0..bf0ebbeae 100644
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -31,6 +31,16 @@ class LanguageTest extends TestCase
         $loginPageFrenchReq->assertSee('Se Connecter');
     }
 
+    public function test_public_lang_autodetect_can_be_disabled()
+    {
+        config()->set('app.auto_detect_locale', false);
+        $loginReq = $this->get('/login');
+        $loginReq->assertSee('Log In');
+
+        $loginPageFrenchReq = $this->get('/login', ['Accept-Language' => 'fr']);
+        $loginPageFrenchReq->assertDontSee('Se Connecter');
+    }
+
     public function test_js_endpoint_for_each_language()
     {