diff --git a/tests/Integration/LdapIntegrationTest.php b/tests/Integration/LdapIntegrationTest.php
index 8c1e6367..1011840e 100644
--- a/tests/Integration/LdapIntegrationTest.php
+++ b/tests/Integration/LdapIntegrationTest.php
@@ -8,16 +8,16 @@
  */
 namespace Piwik\Plugins\LoginLdap\tests\Integration;
 
-use DatabaseTestCase;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Log;
 use Piwik\Config;
 use Piwik\Plugins\LoginLdap\Ldap\LdapFunctions;
-use Piwik\Tests\Fixture;
+use Piwik\Tests\Framework\Fixture;
 use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
-abstract class LdapIntegrationTest extends DatabaseTestCase
+abstract class LdapIntegrationTest extends IntegrationTestCase
 {
     const SERVER_HOST_NAME = 'localhost';
     const SERVER_PORT = 389;
diff --git a/tests/Integration/LdapUserSynchronizationTest.php b/tests/Integration/LdapUserSynchronizationTest.php
index ebe6dcbd..eba5d179 100644
--- a/tests/Integration/LdapUserSynchronizationTest.php
+++ b/tests/Integration/LdapUserSynchronizationTest.php
@@ -230,11 +230,11 @@ public function test_CorrectExistingUserUpdated_WhenUserEmailSuffixUsed()
         // authenticate via ldap to add the user w/ the email suffix
         $this->authenticateViaLdap($login = 'msmarvel', $pass = 'enrogue');
 
-        $user = $this->getUser('msmarvel');
+        $user = $this->getUser('msmarvel@wrandh.com');
 
         $this->assertNotEmpty($user);
 
-        // authenticate again to make sure the correct user is updated
+        // authenticate again to make sure the correct user is updated and we didn't try to add again
         $this->authenticateViaLdap($login = 'msmarvel', $pass = 'enrogue');
     }