diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserPerformanceTestActivity.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserPerformanceTestActivity.kt
index 547d170b87..e0cc79c8c2 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserPerformanceTestActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserPerformanceTestActivity.kt
@@ -8,7 +8,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import mozilla.components.support.utils.SafeIntent
-import org.mozilla.fenix.HomeActivity
+import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.ext.components
 
 /**
@@ -22,6 +22,12 @@ class BrowserPerformanceTestActivity : Activity() {
 
         components.core.testConfig = SafeIntent(intent).extras
 
-        startActivity(Intent(this, HomeActivity::class.java))
+        val intent = Intent(intent)
+
+        intent.setClassName(applicationContext, IntentReceiverActivity::class.java.name)
+
+        startActivity(intent)
+
+        finish()
     }
 }
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 a513e9f83b..18b059b756 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -43,6 +43,7 @@ class Core(private val context: Context) {
 
         testConfig?.let {
             builder.extras(it)
+                .remoteDebuggingEnabled(true)
         }
 
         val runtimeSettings = builder