diff --git a/.env.test b/.env.test
index c604b65a8..57c5e2134 100644
--- a/.env.test
+++ b/.env.test
@@ -1,3 +1,4 @@
 DATABASE_URL=sqlite:///%kernel.project_dir%/data/db/wallabag_test.sqlite?charset=utf8
 #DATABASE_URL=mysql://root:wallaroot@mariadb:3306/wallabag_test?charset=utf8mb4
 #DATABASE_URL=postgres://wallabag:wallapass@postgres:5432/wallabag_test?charset=utf8
+FOSUSER_REGISTRATION=true
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 5a2adb377..b68e0fde8 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -3,7 +3,7 @@ imports:
     - { resource: services_test.yml }
 
 parameters:
-    fosuser_registration: true
+    fosuser_registration: '%env(FOSUSER_REGISTRATION)%'
     database_url: '%env(resolve:DATABASE_URL)%'
     domain_name: '%env(DOMAIN_NAME)%'
 
diff --git a/tests/Controller/Api/WallabagRestControllerTest.php b/tests/Controller/Api/WallabagRestControllerTest.php
index d73115cd6..429fb037f 100644
--- a/tests/Controller/Api/WallabagRestControllerTest.php
+++ b/tests/Controller/Api/WallabagRestControllerTest.php
@@ -41,12 +41,6 @@ class WallabagRestControllerTest extends WallabagApiTestCase
         // create a new client instead of using $this->client to be sure client isn't authenticated
         $client = $this->createUnauthorizedClient();
 
-        if (!$client->getContainer()->getParameter('fosuser_registration')) {
-            $this->markTestSkipped('fosuser_registration is not enabled.');
-
-            return;
-        }
-
         $client->getContainer()->get(Config::class)->set('api_user_registration', 1);
 
         $client->request('GET', '/api/info');
diff --git a/tests/Controller/SecurityControllerTest.php b/tests/Controller/SecurityControllerTest.php
index 3ff4c57bf..0de59a668 100644
--- a/tests/Controller/SecurityControllerTest.php
+++ b/tests/Controller/SecurityControllerTest.php
@@ -85,13 +85,6 @@ class SecurityControllerTest extends WallabagTestCase
     public function testEnabledRegistration()
     {
         $client = $this->getTestClient();
-
-        if (!$client->getContainer()->getParameter('fosuser_registration')) {
-            $this->markTestSkipped('fosuser_registration is not enabled.');
-
-            return;
-        }
-
         $client->followRedirects();
         $client->request('GET', '/register');
         $this->assertStringContainsString('registration.submit', $client->getResponse()->getContent());