diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index 457c7f638..d1f714984 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -56,6 +56,7 @@ class Components(private val context: Context) {
     }
     val services by lazyMonitored { Services(context, backgroundServices.accountManager) }
     val core by lazyMonitored { Core(context, analytics.crashReporter, strictMode) }
+    @Suppress("Deprecation")
     val useCases by lazyMonitored {
         UseCases(
             context,
@@ -66,6 +67,7 @@ class Components(private val context: Context) {
             core.topSitesStorage
         )
     }
+    @Suppress("Deprecation")
     val intentProcessors by lazyMonitored {
         IntentProcessors(
             context,
diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 9a4889eff..41dfa2543 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -201,10 +201,12 @@ class Core(
         )
     }
 
+    @Suppress("Deprecation")
     private fun lookupSessionManager(): SessionManager {
         return sessionManager
     }
 
+    @Suppress("Deprecation")
     private fun findSessionById(tabId: String): Session? {
         return sessionManager.findSessionById(tabId)
     }
@@ -227,6 +229,7 @@ class Core(
      * sessions from the [SessionStorage], and with a default session (about:blank) in
      * case all sessions/tabs are closed.
      */
+    @Deprecated("Use browser store (for reading) and use cases (for writing) instead")
     val sessionManager by lazyMonitored {
         SessionManager(engine, store).also {
             // Install the "icons" WebExtension to automatically load icons for every visited website.
diff --git a/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt b/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
index 577790914..dfc88b0e9 100644
--- a/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt
@@ -16,6 +16,7 @@ class TestComponents(private val context: Context) : Components(context) {
     }
     override val services by lazy { Services(context, backgroundServices.accountManager) }
     override val core by lazy { TestCore(context, analytics.crashReporter) }
+    @Suppress("Deprecation")
     override val useCases by lazy {
         UseCases(
             context,