diff --git a/app/build.gradle b/app/build.gradle
index 8b88b8f..a5cdc7b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -169,7 +169,7 @@ afterEvaluate {
  * so this dependency fixes the issue.
  */
 tasks.whenTaskAdded { task ->
-    if (task.name.contains("testFullDebugUnitTest")) {
+    if (task.name.contains("compileFullDebugUnitTestSources")) {
         task.dependsOn assembleFullDebug
     }
 }
\ No newline at end of file
diff --git a/app/src/test/README.md b/app/src/test/README.md
index 1c9d45e..df25fb2 100644
--- a/app/src/test/README.md
+++ b/app/src/test/README.md
@@ -6,9 +6,10 @@ You can run the tests as follows:
 
 ### Android Studio
 
-1. Select build variant "fullDebug"
-2. Set the [Project view](https://developer.android.com/studio/projects/index.html) to Android
-3. Right-click on the directory "test" and select "Run tests"
+1. Make sure in the Run/Debug Configurations - Android JUnit - Defaults for Working directory: `$MODULE_DIR$` is set.
+2. Select build variant "fullDebug"
+3. Set the [Project view](https://developer.android.com/studio/projects/index.html) to Android
+4. Right-click on the directory "test" and select "Run tests"
 
 ### Commandline