diff --git a/sdk/src/androidTest/java/com/bugsnag/android/BeforeSendSessionTest.kt b/sdk/src/androidTest/java/com/bugsnag/android/BeforeSendSessionTest.kt
deleted file mode 100644
index e2d67ce1fd..0000000000
--- a/sdk/src/androidTest/java/com/bugsnag/android/BeforeSendSessionTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.bugsnag.android
-
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import java.util.concurrent.CountDownLatch
-
-class BeforeSendSessionTest {
-
-    private val client = BugsnagTestUtils.generateClient()
-    private val sessionTracker = client.sessionTracker
-
-    @Before
-    fun setUp() {
-    }
-
-    @Test
-    fun testBeforeSendCallbackInvoked() {
-        val latch = CountDownLatch(1)
-        var data: SessionTrackingPayload? = null
-
-        client.config.addBeforeSendSession { it.device["foo"] = "bar" }
-        client.config.addBeforeSendSession { it.device["foo2"] = 5 }
-
-        client.config.delivery = object : Delivery {
-            override fun deliver(payload: SessionTrackingPayload, config: Configuration) {
-                data = payload
-                latch.countDown()
-            }
-
-            override fun deliver(report: Report, config: Configuration) {}
-        }
-
-        sessionTracker.startSession(false)
-        latch.await()
-
-        assertEquals("bar", data!!.device["foo"])
-        assertEquals(5, data!!.device["foo2"])
-    }
-}
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java b/sdk/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java
index 6a6fc3505d..2b80d4ccdc 100644
--- a/sdk/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java
+++ b/sdk/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java
@@ -44,10 +44,13 @@ static SharedPreferences getSharedPrefs(Context context) {
         return context.getSharedPreferences("com.bugsnag.android", Context.MODE_PRIVATE);
     }
 
+    static Client generateClient(Configuration config) {
+        config.setDelivery(generateDelivery());
+        return new Client(InstrumentationRegistry.getTargetContext(), config);
+    }
+
     static Client generateClient() {
-        Client client = new Client(InstrumentationRegistry.getContext(), "api-key");
-        client.config.setDelivery(generateDelivery());
-        return client;
+        return generateClient(new Configuration("api-key"));
     }
 
     static Session generateSession() {
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ClientTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ClientTest.java
index 0b537e35c8..56d4be5a99 100644
--- a/sdk/src/androidTest/java/com/bugsnag/android/ClientTest.java
+++ b/sdk/src/androidTest/java/com/bugsnag/android/ClientTest.java
@@ -1,6 +1,7 @@
 package com.bugsnag.android;
 
 import static com.bugsnag.android.BugsnagTestUtils.generateClient;
+import static com.bugsnag.android.BugsnagTestUtils.generateConfiguration;
 import static com.bugsnag.android.BugsnagTestUtils.getSharedPrefs;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -229,7 +230,9 @@ public void testFullManifestConfig() {
     @SuppressWarnings("deprecation") // test backwards compatibility of client.setMaxBreadcrumbs
     @Test
     public void testMaxBreadcrumbs() {
-        client = generateClient();
+        Configuration config = generateConfiguration();
+        config.setAutomaticallyCollectBreadcrumbs(false);
+        client = generateClient(config);
         assertEquals(0, client.breadcrumbs.store.size());
 
         client.setMaxBreadcrumbs(1);
@@ -246,7 +249,9 @@ public void testMaxBreadcrumbs() {
 
     @Test
     public void testClearBreadcrumbs() {
-        client = generateClient();
+        Configuration config = generateConfiguration();
+        config.setAutomaticallyCollectBreadcrumbs(false);
+        client = generateClient(config);
         assertEquals(0, client.breadcrumbs.store.size());
 
         client.leaveBreadcrumb("test");
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java
index 081d4d827b..d64755a2f0 100644
--- a/sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java
+++ b/sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java
@@ -129,23 +129,6 @@ public void isStartupCrash() throws Exception {
         assertFalse(errorStore.isStartupCrash(10000));
     }
 
-    @Test
-    public void testFindStoredFiles() {
-        assertEquals(0, errorStore.queuedFiles.size());
-        writeErrorToStore();
-        assertEquals(0, errorStore.queuedFiles.size());
-
-        List<File> storedFiles = errorStore.findStoredFiles();
-        assertEquals(1, storedFiles.size());
-        assertEquals(1, errorStore.queuedFiles.size());
-
-        writeErrorToStore();
-        writeErrorToStore();
-        storedFiles = errorStore.findStoredFiles();
-        assertEquals(2, storedFiles.size());
-        assertEquals(3, errorStore.queuedFiles.size());
-    }
-
     @Test
     public void testCancelQueuedFiles() {
         assertEquals(0, errorStore.queuedFiles.size());
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java b/sdk/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java
index dde426a003..cce0722c05 100644
--- a/sdk/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java
+++ b/sdk/src/androidTest/java/com/bugsnag/android/NullMetadataTest.java
@@ -25,6 +25,7 @@ public class NullMetadataTest {
 
     private Configuration config;
     private Throwable throwable;
+    private Client client;
 
     /**
      * Generates a bugsnag client with a NOP error api client
@@ -34,7 +35,7 @@ public class NullMetadataTest {
     @Before
     public void setUp() throws Exception {
         config = new Configuration("api-key");
-        generateClient();
+        client = generateClient(config);
         throwable = new RuntimeException("Test");
     }
 
@@ -94,7 +95,7 @@ public void testConfigSetNullMetadata() throws Exception {
 
     @Test
     public void testNotify() throws Exception {
-        Bugsnag.beforeNotify(new BeforeNotify() {
+        client.beforeNotify(new BeforeNotify() {
             @Override
             public boolean run(@NonNull Error error) {
                 validateDefaultMetadata(error.getMetaData());
@@ -103,7 +104,6 @@ public boolean run(@NonNull Error error) {
         });
         Error error = new Error.Builder(config, new Throwable(),
             generateSessionTracker(), Thread.currentThread(), false).build();
-        Client client = Bugsnag.getClient();
         client.notify(error, DeliveryStyle.SAME_THREAD, null);
     }