diff --git a/src/androidTest/java/org/tasks/injection/InjectingTestCase.java b/src/androidTest/java/org/tasks/injection/InjectingTestCase.java
index 1b7aa54a8..8391b83cf 100644
--- a/src/androidTest/java/org/tasks/injection/InjectingTestCase.java
+++ b/src/androidTest/java/org/tasks/injection/InjectingTestCase.java
@@ -2,8 +2,6 @@ package org.tasks.injection;
 
 import android.test.AndroidTestCase;
 
-import com.todoroo.andlib.service.ContextManager;
-
 import dagger.ObjectGraph;
 
 import static org.tasks.TestUtilities.initializeMockito;
@@ -12,8 +10,6 @@ public abstract class InjectingTestCase extends AndroidTestCase {
 
     @Override
     protected void setUp() {
-        ContextManager.setContext(getContext());
-
         initializeMockito(getContext());
 
         ObjectGraph objectGraph = ObjectGraph.create(new TestModule(getContext()));
diff --git a/src/androidTest/java/org/tasks/injection/TestModule.java b/src/androidTest/java/org/tasks/injection/TestModule.java
index d8fbf72a2..1fb46e16b 100644
--- a/src/androidTest/java/org/tasks/injection/TestModule.java
+++ b/src/androidTest/java/org/tasks/injection/TestModule.java
@@ -57,7 +57,7 @@ public class TestModule {
     @Singleton
     @Provides
     public Database getDatabase() {
-        return new Database() {
+        return new Database(context) {
             @Override
             public String getName() {
                 return "databasetest";