diff --git a/app/build.gradle b/app/build.gradle
index 1800a7f01..4cef48e69 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -381,6 +381,7 @@ android {
     }
 
     lintOptions {
+        checkReleaseBuilds false
         abortOnError true
         baseline file("lint-baseline.xml")
         disable "LintError"
diff --git a/build.gradle b/build.gradle
index a6effc3a0..392f5be51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,5 +83,5 @@ task qa {
             ':Signal-Android:lintPlayProdRelease',
             'Signal-Android:ktlintCheck',
             ':libsignal-service:test',
-            ':Signal-Android:assemblePlayProdDebug'
+            ':Signal-Android:assemblePlayProdRelease'
 }
diff --git a/device-transfer/lib/src/test/java/org/signal/devicetransfer/DeviceTransferAuthenticationTest.java b/device-transfer/lib/src/test/java/org/signal/devicetransfer/DeviceTransferAuthenticationTest.java
index ea17e8546..7106f9ea2 100644
--- a/device-transfer/lib/src/test/java/org/signal/devicetransfer/DeviceTransferAuthenticationTest.java
+++ b/device-transfer/lib/src/test/java/org/signal/devicetransfer/DeviceTransferAuthenticationTest.java
@@ -17,14 +17,12 @@ import static org.whispersystems.signalservice.test.LibSignalLibraryUtil.assumeL
 public class DeviceTransferAuthenticationTest {
 
   private byte[] certificate;
-  private byte[] badCertificate;
 
   @Before
   public void ensureNativeSupported() throws KeyGenerationFailedException {
     assumeLibSignalSupportedOnOS();
 
-    certificate    = SelfSignedIdentity.create().getX509Encoded();
-    badCertificate = SelfSignedIdentity.create().getX509Encoded();
+    certificate = SelfSignedIdentity.create().getX509Encoded();
   }
 
   @Test
@@ -39,9 +37,10 @@ public class DeviceTransferAuthenticationTest {
   }
 
   @Test(expected = DeviceTransferAuthenticationException.class)
-  public void testServerCompute_withChangedClientCertificate() throws DeviceTransferAuthenticationException {
-    Client client = new Client(badCertificate);
-    Server server = new Server(certificate, client.getCommitment());
+  public void testServerCompute_withChangedClientCertificate() throws DeviceTransferAuthenticationException, KeyGenerationFailedException {
+    byte[] badCertificate = SelfSignedIdentity.create().getX509Encoded();
+    Client client         = new Client(badCertificate);
+    Server server         = new Server(certificate, client.getCommitment());
 
     byte[] clientRandom = client.setServerRandomAndGetClientRandom(server.getRandom());
 
diff --git a/gradle.properties b/gradle.properties
index 991be5f76..7b115be2c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx3072m
+org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
 kapt.incremental.apt=false
\ No newline at end of file