diff --git a/android/MapboxGLAndroidSDK/proguard-rules.pro b/android/MapboxGLAndroidSDK/proguard-rules.pro
index 6853f3dde..c805eee19 100644
--- a/android/MapboxGLAndroidSDK/proguard-rules.pro
+++ b/android/MapboxGLAndroidSDK/proguard-rules.pro
@@ -16,9 +16,4 @@
 -keep class com.mapbox.mapboxsdk.http.** { *; }
 
 # Package views
--keep class com.mapbox.mapboxsdk.views.MapView**
--keep class com.mapbox.mapboxsdk.views.NativeMapView**
--keepclassmembers class com.mapbox.mapboxsdk.views.NativeMapView** {
-    *;
-}
-
+-keep class com.mapbox.mapboxsdk.views.** { *; }
diff --git a/android/MapboxGLAndroidSDKTestApp/build.gradle b/android/MapboxGLAndroidSDKTestApp/build.gradle
index bdb483721..54b7a3b1d 100644
--- a/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -69,7 +69,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
index 578d94692..43a408f33 100644
--- a/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
+++ b/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
@@ -1 +1,3 @@
-# Proguard configuration is handeld in the SDK
\ No newline at end of file
+# Mapbox ProGuard configuration is handled in the SDK
+
+-keep class android.support.** { *; }
\ No newline at end of file