diff --git a/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java b/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java
index 4d8e58c17..244d18b19 100644
--- a/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java
+++ b/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java
@@ -1,13 +1,18 @@
 package org.tasks.caldav;
 
-import androidx.test.runner.AndroidJUnit4;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
+import static org.tasks.injection.TestModule.newPreferences;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class CaldavClientTest {
+
   @Test
   public void dontCrashOnSpaceInUrl() {
-    new CaldavClient("https://example.com/remote.php/a space/", "username", "password");
+    new CaldavClient(null, newPreferences(getTargetContext()), null)
+        .forUrl("https://example.com/remote.php/a space/", "username", "password");
   }
 }
diff --git a/app/src/main/java/org/tasks/caldav/CaldavClient.java b/app/src/main/java/org/tasks/caldav/CaldavClient.java
index 87a64434b..68a3ff936 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavClient.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavClient.java
@@ -6,7 +6,6 @@ import static at.bitfire.dav4android.XmlUtils.NS_CARDDAV;
 import static at.bitfire.dav4android.XmlUtils.NS_WEBDAV;
 import static java.util.Arrays.asList;
 
-import android.content.Context;
 import at.bitfire.dav4android.BasicDigestAuthHandler;
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.DavResponse;
@@ -33,7 +32,6 @@ import org.tasks.DebugNetworkInterceptor;
 import org.tasks.R;
 import org.tasks.data.CaldavAccount;
 import org.tasks.data.CaldavCalendar;
-import org.tasks.injection.ForApplication;
 import org.tasks.preferences.Preferences;
 import org.tasks.security.Encryption;
 import org.tasks.ui.DisplayableException;
@@ -44,7 +42,6 @@ import timber.log.Timber;
 
 public class CaldavClient {
 
-  private final Context context;
   private final Encryption encryption;
   private final Preferences preferences;
   private final DebugNetworkInterceptor interceptor;
@@ -53,11 +50,9 @@ public class CaldavClient {
 
   @Inject
   public CaldavClient(
-      @ForApplication Context context,
       Encryption encryption,
       Preferences preferences,
       DebugNetworkInterceptor interceptor) {
-    this.context = context;
     this.encryption = encryption;
     this.preferences = preferences;
     this.interceptor = interceptor;
@@ -66,14 +61,12 @@ public class CaldavClient {
   }
 
   private CaldavClient(
-      Context context,
       Encryption encryption,
       Preferences preferences,
       DebugNetworkInterceptor interceptor,
       String url,
       String username,
       String password) {
-    this.context = context;
     this.encryption = encryption;
     this.preferences = preferences;
     this.interceptor = interceptor;
@@ -105,7 +98,7 @@ public class CaldavClient {
   }
 
   public CaldavClient forUrl(String url, String username, String password) {
-    return new CaldavClient(context, encryption, preferences, interceptor, url, username, password);
+    return new CaldavClient(encryption, preferences, interceptor, url, username, password);
   }
 
   private String tryFindPrincipal() throws DavException, IOException {