diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingService.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingService.kt
index 3d251f6e64..a8bc069893 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingService.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingService.kt
@@ -22,7 +22,6 @@ import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.pushproviders.api.PushHandler
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -33,8 +32,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
     @Inject lateinit var firebaseNewTokenHandler: FirebaseNewTokenHandler
     @Inject lateinit var pushParser: FirebasePushParser
     @Inject lateinit var pushHandler: PushHandler
-
-    private val coroutineScope = CoroutineScope(SupervisorJob())
+    @Inject lateinit var coroutineScope: CoroutineScope
 
     override fun onCreate() {
         super.onCreate()
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt
index a8e04cd877..9dfb453919 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package io.element.android.libraries.pushproviders.firebase
 
 import android.os.Bundle
@@ -26,8 +28,10 @@ import io.element.android.libraries.pushproviders.api.PushData
 import io.element.android.libraries.pushproviders.api.PushHandler
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -43,7 +47,6 @@ class VectorFirebaseMessagingServiceTest {
         vectorFirebaseMessagingService.onMessageReceived(RemoteMessage(Bundle()))
     }
 
-    @Ignore("The test does not wait for the end of the coroutine.")
     @Test
     fun `test receiving valid data`() = runTest {
         val lambda = lambdaRecorder<PushData, Unit> { }
@@ -59,12 +62,12 @@ class VectorFirebaseMessagingServiceTest {
                 },
             )
         )
+        advanceUntilIdle()
         lambda.assertions()
             .isCalledOnce()
             .with(value(PushData(AN_EVENT_ID, A_ROOM_ID, null, A_SECRET)))
     }
 
-    @Ignore("The test does not wait for the end of the coroutine.")
     @Test
     fun `test new token is forwarded to the handler`() = runTest {
         val lambda = lambdaRecorder<String, Unit> { }
@@ -72,12 +75,13 @@ class VectorFirebaseMessagingServiceTest {
             firebaseNewTokenHandler = FakeFirebaseNewTokenHandler(handleResult = lambda)
         )
         vectorFirebaseMessagingService.onNewToken("aToken")
+        advanceUntilIdle()
         lambda.assertions()
             .isCalledOnce()
             .with(value("aToken"))
     }
 
-    private fun createVectorFirebaseMessagingService(
+    private fun TestScope.createVectorFirebaseMessagingService(
         firebaseNewTokenHandler: FirebaseNewTokenHandler = FakeFirebaseNewTokenHandler(),
         pushHandler: PushHandler = FakePushHandler(),
     ): VectorFirebaseMessagingService {
@@ -85,6 +89,7 @@ class VectorFirebaseMessagingServiceTest {
             this.firebaseNewTokenHandler = firebaseNewTokenHandler
             this.pushParser = FirebasePushParser()
             this.pushHandler = pushHandler
+            this.coroutineScope = this@createVectorFirebaseMessagingService
         }
     }
 }