diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CommonTestHelper.kt
index 44770f3378..da14b21f3c 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CommonTestHelper.kt
@@ -130,12 +130,14 @@ class CommonTestHelper(context: Context) {
             }
         }
         val timeline = room.createTimeline(null, TimelineSettings(10))
+        timeline.start()
         timeline.addListener(onEventSentListener)
         for (i in 0 until nbOfMessages) {
             room.sendTextMessage(message + " #" + (i + 1))
         }
         await(latch)
         timeline.removeListener(onEventSentListener)
+        timeline.dispose()
 
         // Check that all events has been created
         assertEquals(nbOfMessages.toLong(), sentEvents.size.toLong())
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt
index 46aeb2a926..826c70a63f 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt
@@ -236,7 +236,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             }
         }
 
-        val bobTimeline = roomFromBobPOV.createTimeline(null, TimelineSettings(10))
+        val bobTimeline = roomFromBobPOV.createTimeline(null, TimelineSettings(20))
         bobTimeline.start()
         bobTimeline.addListener(bobEventsListener)
 
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestConstants.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestConstants.kt
index 60cc87d330..2346898ca7 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestConstants.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/TestConstants.kt
@@ -22,11 +22,11 @@ object TestConstants {
 
     const val TESTS_HOME_SERVER_URL = "http://10.0.2.2:8080"
 
-    // Time out to use when waiting for server response. 60s
-    private const val AWAIT_TIME_OUT_MILLIS = 60000
+    // Time out to use when waiting for server response. 10s
+    private const val AWAIT_TIME_OUT_MILLIS = 10_000
 
     // Time out to use when waiting for server response, when the debugger is connected. 10 minutes
-    private const val AWAIT_TIME_OUT_WITH_DEBUGGER_MILLIS = 10 * 60000
+    private const val AWAIT_TIME_OUT_WITH_DEBUGGER_MILLIS = 10 * 60_000
 
     const val USER_ALICE = "Alice"
     const val USER_BOB = "Bob"
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt
index 89864e20b9..e0c7e8273a 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -47,6 +47,7 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -101,6 +102,8 @@ class KeysBackupTest : InstrumentedTest {
         assertEquals(sessionsCount, sessions3.size)
         assertEquals(sessionsCount, cryptoTestData.firstSession.cryptoService().inboundGroupSessionsCount(false))
         assertEquals(0, cryptoTestData.firstSession.cryptoService().inboundGroupSessionsCount(true))
+
+        cryptoTestData.cleanUp(mTestHelper)
     }
 
     /**
@@ -325,6 +328,8 @@ class KeysBackupTest : InstrumentedTest {
      */
     @Test
     fun restoreKeysBackupAndKeyShareRequestTest() {
+        fail("Check with Valere for this test. I think we do not send key share request")
+
         val testData = createKeysBackupScenarioWithPassword(null)
 
         // - Check the SDK sent key share requests
@@ -885,12 +890,12 @@ class KeysBackupTest : InstrumentedTest {
         keysBackup2.addListener(object : KeysBackupStateListener {
             override fun onStateChange(newState: KeysBackupState) {
                 // Check the backup completes
-                if (keysBackup.state == KeysBackupState.ReadyToBackUp) {
+                if (newState == KeysBackupState.ReadyToBackUp) {
                     count++
 
                     if (count == 2) {
                         // Remove itself from the list of listeners
-                        keysBackup.removeListener(this)
+                        keysBackup2.removeListener(this)
 
                         latch.countDown()
                     }
@@ -1026,15 +1031,14 @@ class KeysBackupTest : InstrumentedTest {
 
         var isSuccessful = false
         val latch2 = CountDownLatch(1)
-        keysBackup2.backupAllGroupSessions(object : ProgressListener {
-            override fun onProgress(progress: Int, total: Int) {
-            }
-        }, object : TestMatrixCallback<Unit>(latch2, false) {
-            override fun onSuccess(data: Unit) {
-                isSuccessful = true
-                super.onSuccess(data)
-            }
-        })
+        keysBackup2.backupAllGroupSessions(
+                null,
+                object : TestMatrixCallback<Unit>(latch2, false) {
+                    override fun onSuccess(data: Unit) {
+                        isSuccessful = true
+                        super.onSuccess(data)
+                    }
+                })
         mTestHelper.await(latch2)
 
         assertFalse(isSuccessful)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
index e7cb963c5f..c4ddaec98e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
@@ -217,4 +217,9 @@ internal class DefaultSession @Inject constructor(
     override fun removeListener(listener: Session.Listener) {
         sessionListeners.removeListener(listener)
     }
+
+    // For easy debugging
+    override fun toString(): String {
+        return "$myUserId - ${sessionParams.credentials.deviceId}"
+    }
 }