diff --git a/app/build.gradle b/app/build.gradle
index 34adc5157..955432a46 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,6 +17,7 @@ android {
         versionCode Config.versionCode
         versionName Config.versionName + Config.generateVersionSuffix()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        manifestPlaceholders.isRaptorEnabled = "false"
     }
     buildTypes {
         release {
@@ -28,6 +29,7 @@ android {
             shrinkResources false
             minifyEnabled false
             applicationIdSuffix ".debug"
+            manifestPlaceholders.isRaptorEnabled = "true"
         }
     }
 
@@ -217,6 +219,10 @@ android.applicationVariants.all { variant ->
     buildConfigField 'String', 'BUILD_DATE', '"' + buildDate + '"'
 }
 
+if (project.hasProperty("raptor")) {
+    android.defaultConfig.manifestPlaceholders.isRaptorEnabled = "true"
+}
+
 // Normally this should use the same version as the glean dependency. But since we are currently using AC snapshots we
 // can't reference a git tag with a specific version here. So we are just using "master" and hoping for the best.
 apply from: 'https://github.com/mozilla-mobile/android-components/raw/master/components/service/glean/scripts/sdk_generator.gradle'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4b4d28653..f93af7994 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,7 +68,8 @@
         </activity>
 
         <activity android:name=".browser.BrowserPerformanceTestActivity"
-                  android:exported="true"/>
+                  android:exported="${isRaptorEnabled}"
+                  android:enabled="${isRaptorEnabled}"/>
 
         <service
                 android:name=".customtabs.CustomTabsService"