diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index a38d6256c..5eb492c49 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -65,4 +65,33 @@
 
 -keep class * implements android.os.Parcelable {
   public static final android.os.Parcelable$Creator *;
-}
\ No newline at end of file
+}
+
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn com.fasterxml.jackson.databind.deser.std.StdDeserializer
+-dontwarn com.fasterxml.jackson.databind.ser.std.StdSerializer
+-dontwarn com.google.errorprone.annotations.FormatMethod
+-dontwarn com.google.errorprone.annotations.Immutable
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
+
+# And some more for Google Maps
+-dontwarn com.google.appengine.api.urlfetch.FetchOptions$Builder
+-dontwarn com.google.appengine.api.urlfetch.FetchOptions
+-dontwarn com.google.appengine.api.urlfetch.HTTPHeader
+-dontwarn com.google.appengine.api.urlfetch.HTTPMethod
+-dontwarn com.google.appengine.api.urlfetch.HTTPRequest
+-dontwarn com.google.appengine.api.urlfetch.HTTPResponse
+-dontwarn com.google.appengine.api.urlfetch.URLFetchService
+-dontwarn com.google.appengine.api.urlfetch.URLFetchServiceFactory
+-dontwarn org.joda.convert.FromString
+-dontwarn org.joda.convert.ToString
+-dontwarn org.slf4j.impl.StaticLoggerBinder
\ No newline at end of file
diff --git a/app/src/androidTestGmap/java/me/hufman/androidautoidrive/InstrumentedTestGMaps.kt b/app/src/androidTestGmap/java/me/hufman/androidautoidrive/InstrumentedTestGMaps.kt
index 7e1f78f76..8dd2b7f9a 100644
--- a/app/src/androidTestGmap/java/me/hufman/androidautoidrive/InstrumentedTestGMaps.kt
+++ b/app/src/androidTestGmap/java/me/hufman/androidautoidrive/InstrumentedTestGMaps.kt
@@ -6,7 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.android.gms.maps.model.LatLng
-import com.nhaarman.mockito_kotlin.*
+import org.mockito.kotlin.*
 import io.bimmergestalt.idriveconnectkit.RHMIDimensions
 import kotlinx.coroutines.runBlocking
 import me.hufman.androidautoidrive.carapp.maps.*
diff --git a/app/src/test/java/me/hufman/androidautoidrive/phoneui/MusicActivityIconsModelTest.kt b/app/src/test/java/me/hufman/androidautoidrive/phoneui/MusicActivityIconsModelTest.kt
index c2937138e..4bad2a4cc 100644
--- a/app/src/test/java/me/hufman/androidautoidrive/phoneui/MusicActivityIconsModelTest.kt
+++ b/app/src/test/java/me/hufman/androidautoidrive/phoneui/MusicActivityIconsModelTest.kt
@@ -21,7 +21,9 @@ class MusicActivityIconsModelTest {
 				PLACEHOLDER_ID to mock(),
 				FOLDER_ID to mock()
 		)
-		val icons = spy(realIcons)
+		val icons = spy(HashMap<String, Bitmap>()).apply {
+			putAll(realIcons)
+		}
 		val viewModel = MusicActivityIconsModel(icons)
 
 		assertEquals(realIcons[ARTIST_ID], viewModel.artistIcon)