diff --git a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
index e9e5ee3b1..35de47f94 100644
--- a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
@@ -17,7 +17,7 @@ class DeveloperControllerTest extends WallabagCoreTestCase
         $crawler = $client->request('GET', '/developer/client/create');
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('button[type=submit]')->form();
+        $form = $crawler->filter('button[id=client_save]')->form();
 
         $data = [
             'client[name]' => 'My app',
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index e424f152c..12788366d 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -476,7 +476,7 @@ class EntryControllerTest extends WallabagCoreTestCase
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('button[type=submit]')->form();
+        $form = $crawler->filter('button[id=entry_save]')->form();
 
         $data = [
             'entry[title]' => 'My updated title hehe :)',
@@ -509,7 +509,7 @@ class EntryControllerTest extends WallabagCoreTestCase
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('button[type=submit]')->form();
+        $form = $crawler->filter('button[id=entry_save]')->form();
 
         $data = [
             'entry[title]' => 'My updated title hehe :)',
diff --git a/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php b/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
index 17ce1a2ad..01dd2451f 100644
--- a/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
@@ -14,7 +14,7 @@ class PocketControllerTest extends WallabagCoreTestCase
         $crawler = $client->request('GET', '/import/pocket');
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->assertSame(1, $crawler->filter('button[type=submit]')->count());
+        $this->assertSame(1, $crawler->filter('button[name=action]')->count());
     }
 
     public function testImportPocketWithRabbitEnabled()
@@ -27,7 +27,7 @@ class PocketControllerTest extends WallabagCoreTestCase
         $crawler = $client->request('GET', '/import/pocket');
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->assertSame(1, $crawler->filter('button[type=submit]')->count());
+        $this->assertSame(1, $crawler->filter('button[name=action]')->count());
 
         $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 0);
     }
@@ -43,7 +43,7 @@ class PocketControllerTest extends WallabagCoreTestCase
         $crawler = $client->request('GET', '/import/pocket');
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
-        $this->assertSame(1, $crawler->filter('button[type=submit]')->count());
+        $this->assertSame(1, $crawler->filter('button[name=action]')->count());
 
         $client->getContainer()->get('craue_config')->set('import_with_redis', 0);
     }