diff --git a/app/build.gradle b/app/build.gradle
index 0ef46d9ae58d..ec8933dade72 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -485,6 +485,8 @@ nimbus {
     // It will be fetched by Experimenter (the Nimbus experiment website)
     // and used to inform experiment configuration.
     experimenterManifest = ".experimenter.yaml"
+    applicationServicesDir = gradle.hasProperty('localProperties.autoPublish.application-services.dir')
+            ? gradle.getProperty('localProperties.autoPublish.application-services.dir') : null
 }
 
 tasks.withType(KotlinCompile).configureEach {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/NimbusMessagingHomescreenTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/NimbusMessagingHomescreenTest.kt
index a8dc519c7851..3fcdeaf4e12f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/NimbusMessagingHomescreenTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/NimbusMessagingHomescreenTest.kt
@@ -56,7 +56,7 @@ class NimbusMessagingHomescreenTest {
     @Before
     fun setUp() {
         // Set up nimbus message
-        FxNimbusMessaging.features.messaging.withInitializer {
+        FxNimbusMessaging.features.messaging.withInitializer { _, _ ->
             // FML generated objects.
             Messaging(
                 messages = mapOf(
@@ -82,7 +82,7 @@ class NimbusMessagingHomescreenTest {
         }
 
         // Remove some homescreen features not needed for testing
-        FxNimbus.features.homescreen.withInitializer {
+        FxNimbus.features.homescreen.withInitializer { _, _ ->
             // These are FML generated objects and enums
             Homescreen(
                 sectionsEnabled = mapOf(