diff --git a/firebase-database-collection/firebase-database-collection.gradle b/firebase-database-collection/firebase-database-collection.gradle
index 31fdf76a262..97d9a636e77 100644
--- a/firebase-database-collection/firebase-database-collection.gradle
+++ b/firebase-database-collection/firebase-database-collection.gradle
@@ -17,9 +17,6 @@ apply plugin: 'com.android.library'
 def androidVersion = 26
 
 android {
-    lintOptions {
-        abortOnError false
-    }
     compileSdkVersion androidVersion
 }
 
diff --git a/firebase-database/firebase-database.gradle b/firebase-database/firebase-database.gradle
index 1f0d20c7f8f..d3d65abf6a3 100644
--- a/firebase-database/firebase-database.gradle
+++ b/firebase-database/firebase-database.gradle
@@ -38,9 +38,7 @@ android {
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
-        abortOnError false
-    }
+
     buildTypes {
         release {
             minifyEnabled false
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
index f2cefc17444..bb9446f27bd 100644
--- a/firebase-storage/firebase-storage.gradle
+++ b/firebase-storage/firebase-storage.gradle
@@ -38,8 +38,6 @@ android {
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
-    }
 
     buildTypes {
         release {
diff --git a/test-apps/database-test-app/build.gradle b/test-apps/database-test-app/build.gradle
index 6bd58dbc9f2..0de0533d49d 100644
--- a/test-apps/database-test-app/build.gradle
+++ b/test-apps/database-test-app/build.gradle
@@ -30,9 +30,6 @@ android {
 
         vectorDrawables.useSupportLibrary true
 
-        lintOptions {
-            tasks.lint.enabled = false
-        }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/test-apps/firestore-test-app/build.gradle b/test-apps/firestore-test-app/build.gradle
index ca5b4df69e9..be1c2d35183 100644
--- a/test-apps/firestore-test-app/build.gradle
+++ b/test-apps/firestore-test-app/build.gradle
@@ -30,9 +30,6 @@ android {
 
         vectorDrawables.useSupportLibrary true
 
-        lintOptions {
-            tasks.lint.enabled = false
-        }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/test-apps/firestore-test-app/lint.xml b/test-apps/firestore-test-app/lint.xml
new file mode 100644
index 00000000000..5aaf54d15a3
--- /dev/null
+++ b/test-apps/firestore-test-app/lint.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!--gRPC's DNS name resolver checks for javax.naming at runtime to determine if it can be used, but fails gracefullt without it. This lint error is safe to ignore.-->
+    <!--See : https://github.com/grpc/grpc-java/blob/b0f423295b4674cb5247a6143fd211b050ef0065/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java#L73-->
+    <issue id="InvalidPackage">
+        <ignore path="*/io.grpc/grpc-core/*"/>
+    </issue>
+</lint>
diff --git a/test-apps/functions-test-app/build.gradle b/test-apps/functions-test-app/build.gradle
index 98ad178219c..fd6ea2601dc 100644
--- a/test-apps/functions-test-app/build.gradle
+++ b/test-apps/functions-test-app/build.gradle
@@ -27,9 +27,6 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
-        lintOptions {
-            tasks.lint.enabled = false
-        }
     }
 
     buildTypes {
diff --git a/test-apps/storage-test-app/build.gradle b/test-apps/storage-test-app/build.gradle
index b8df14650fb..2e8167a101e 100644
--- a/test-apps/storage-test-app/build.gradle
+++ b/test-apps/storage-test-app/build.gradle
@@ -30,9 +30,6 @@ android {
 
         vectorDrawables.useSupportLibrary true
 
-        lintOptions {
-            tasks.lint.enabled = false
-        }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }