diff --git a/app/build.gradle b/app/build.gradle
index 27f7a052b..5bbded429 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -178,24 +178,6 @@ afterEvaluate {
     initCrashlyticsPropertiesIfNeeded()
 }
 
-android.productFlavors.all { flavour ->
-    def applicationId = flavour.applicationId
-    def adb = android.getAdbExe().toString()
-
-    def grantPermissionsTask = tasks.create("grant${flavour.name.capitalize()}Permissions") << {
-        "${adb} shell pm grant ${applicationId} android.permission.WRITE_EXTERNAL_STORAGE".execute()
-        "${adb} shell pm grant ${applicationId} android.permission.SET_ANIMATION_SCALE".execute()
-    }
-    grantPermissionsTask.description = "Grants permissions for Marshmallow"
-
-    tasks.whenTaskAdded { theTask ->
-        def assemblePattern = ~"assemble${flavour.name.capitalize()}DebugAndroidTest"
-        if (assemblePattern.matcher(theTask.name).matches()) {
-            theTask.dependsOn grantPermissionsTask.name
-        }
-    }
-}
-
 
 def androidSupportVersion       = "26.0.1"
 def androidEspressoVersion      = "3.0.0"
diff --git a/app/src/androidTest/java/org/gnucash/android/test/ui/AccountsActivityTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/AccountsActivityTest.java
index c0c61e22f..d57cfd240 100644
--- a/app/src/androidTest/java/org/gnucash/android/test/ui/AccountsActivityTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/AccountsActivityTest.java
@@ -16,6 +16,7 @@
 
 package org.gnucash.android.test.ui;
 
+import android.Manifest;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
@@ -27,6 +28,7 @@
 import android.support.test.espresso.Espresso;
 import android.support.test.espresso.matcher.ViewMatchers;
 import android.support.test.rule.ActivityTestRule;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v4.app.Fragment;
 import android.util.Log;
@@ -116,6 +118,9 @@ public AccountsActivityTest() {
 //        super(AccountsActivity.class);
     }
 
+
+    @Rule public GrantPermissionRule animationPermissionsRule = GrantPermissionRule.grant(Manifest.permission.SET_ANIMATION_SCALE);
+
     @ClassRule public static DisableAnimationsRule disableAnimationsRule = new DisableAnimationsRule();
 
     @Rule
diff --git a/app/src/androidTest/java/org/gnucash/android/test/ui/CalculatorEditTextTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/CalculatorEditTextTest.java
index 08c687313..f1932b732 100644
--- a/app/src/androidTest/java/org/gnucash/android/test/ui/CalculatorEditTextTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/CalculatorEditTextTest.java
@@ -16,10 +16,12 @@
 
 package org.gnucash.android.test.ui;
 
+import android.Manifest;
 import android.content.Intent;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.test.rule.ActivityTestRule;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
@@ -72,6 +74,9 @@ public class CalculatorEditTextTest {
 	public CalculatorEditTextTest() {
 	}
 
+
+    @Rule public GrantPermissionRule animationPermissionsRule = GrantPermissionRule.grant(Manifest.permission.SET_ANIMATION_SCALE);
+
     @ClassRule
     public static DisableAnimationsRule disableAnimationsRule = new DisableAnimationsRule();
 
diff --git a/app/src/androidTest/java/org/gnucash/android/test/ui/ExportTransactionsTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/ExportTransactionsTest.java
index 5e7117c3a..119e4f033 100644
--- a/app/src/androidTest/java/org/gnucash/android/test/ui/ExportTransactionsTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/ExportTransactionsTest.java
@@ -28,6 +28,7 @@
 import android.support.test.espresso.Espresso;
 import android.support.test.espresso.contrib.DrawerActions;
 import android.support.test.espresso.matcher.ViewMatchers;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v7.preference.PreferenceManager;
 import android.test.ActivityInstrumentationTestCase2;
@@ -59,6 +60,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
@@ -95,7 +97,9 @@ public class ExportTransactionsTest extends
 
 	private AccountsActivity mAcccountsActivity;
 
-    public ExportTransactionsTest() {
+	@Rule public GrantPermissionRule animationPermissionsRule = GrantPermissionRule.grant(Manifest.permission.SET_ANIMATION_SCALE);
+
+	public ExportTransactionsTest() {
 		super(AccountsActivity.class);
 	}
 
diff --git a/app/src/androidTest/java/org/gnucash/android/test/ui/FirstRunWizardActivityTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/FirstRunWizardActivityTest.java
index e80902627..7c4ab6d39 100644
--- a/app/src/androidTest/java/org/gnucash/android/test/ui/FirstRunWizardActivityTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/FirstRunWizardActivityTest.java
@@ -15,9 +15,11 @@
  */
 package org.gnucash.android.test.ui;
 
+import android.Manifest;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
@@ -31,6 +33,7 @@
 import org.gnucash.android.model.BaseModel;
 import org.gnucash.android.ui.wizard.FirstRunWizardActivity;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -56,6 +59,9 @@ public class FirstRunWizardActivityTest extends ActivityInstrumentationTestCase2
     private SplitsDbAdapter mSplitsDbAdapter;
 
     FirstRunWizardActivity mActivity;
+
+    @Rule public GrantPermissionRule animationPermissionsRule = GrantPermissionRule.grant(Manifest.permission.SET_ANIMATION_SCALE);
+
     public FirstRunWizardActivityTest() {
         super(FirstRunWizardActivity.class);
     }
diff --git a/app/src/androidTest/java/org/gnucash/android/test/ui/MultiBookTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/MultiBookTest.java
index b5aeef59c..2306a4ffb 100644
--- a/app/src/androidTest/java/org/gnucash/android/test/ui/MultiBookTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/MultiBookTest.java
@@ -15,9 +15,11 @@
  */
 package org.gnucash.android.test.ui;
 
+import android.Manifest;
 import android.support.test.espresso.contrib.DrawerActions;
 import android.support.test.espresso.intent.Intents;
 import android.support.test.espresso.intent.rule.IntentsTestRule;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.gnucash.android.R;
@@ -54,6 +56,8 @@ public class MultiBookTest {
 
     private static BooksDbAdapter mBooksDbAdapter;
 
+    @Rule public GrantPermissionRule animationPermissionsRule = GrantPermissionRule.grant(Manifest.permission.SET_ANIMATION_SCALE);
+
     @ClassRule
     public static DisableAnimationsRule disableAnimationsRule = new DisableAnimationsRule();
 
diff --git a/app/src/androidTest/java/org/gnucash/android/test/ui/OwnCloudExportTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/OwnCloudExportTest.java
index bda6f16e5..b3e512037 100644
--- a/app/src/androidTest/java/org/gnucash/android/test/ui/OwnCloudExportTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/OwnCloudExportTest.java
@@ -16,6 +16,7 @@
 
 package org.gnucash.android.test.ui;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.SQLException;
@@ -25,6 +26,7 @@
 import android.support.test.espresso.Espresso;
 import android.support.test.espresso.contrib.DrawerActions;
 import android.support.test.rule.ActivityTestRule;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
@@ -97,6 +99,8 @@ public class OwnCloudExportTest {
             AccountsActivity.class);
 
 
+    @Rule public GrantPermissionRule animationPermissionsRule = GrantPermissionRule.grant(Manifest.permission.SET_ANIMATION_SCALE);
+
     @Before
     public void setUp() throws Exception {
 
diff --git a/app/src/androidTest/java/org/gnucash/android/test/ui/PieChartReportTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/PieChartReportTest.java
index df2e367ad..0579c0f41 100644
--- a/app/src/androidTest/java/org/gnucash/android/test/ui/PieChartReportTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/PieChartReportTest.java
@@ -16,6 +16,7 @@
 
 package org.gnucash.android.test.ui;
 
+import android.Manifest;
 import android.content.Context;
 import android.support.test.espresso.ViewAction;
 import android.support.test.espresso.action.CoordinatesProvider;
@@ -23,6 +24,7 @@
 import android.support.test.espresso.action.Press;
 import android.support.test.espresso.action.Tap;
 import android.support.test.rule.ActivityTestRule;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
@@ -101,6 +103,8 @@ public class PieChartReportTest {
     @Rule
     public ActivityTestRule<ReportsActivity> mActivityRule = new ActivityTestRule<>(ReportsActivity.class);
 
+    @Rule public GrantPermissionRule animationPermissionsRule = GrantPermissionRule.grant(Manifest.permission.SET_ANIMATION_SCALE);
+
     @ClassRule
     public static DisableAnimationsRule disableAnimationsRule = new DisableAnimationsRule();
 
diff --git a/app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java
index dc6c2d657..6821e4ca2 100644
--- a/app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java
@@ -16,6 +16,7 @@
 
 package org.gnucash.android.test.ui;
 
+import android.Manifest;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -23,6 +24,7 @@
 import android.content.SharedPreferences.Editor;
 import android.support.test.espresso.Espresso;
 import android.support.test.rule.ActivityTestRule;
+import android.support.test.rule.GrantPermissionRule;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.gnucash.android.R;
@@ -97,6 +99,8 @@ public class TransactionsActivityTest {
     private static SplitsDbAdapter mSplitsDbAdapter;
 	private TransactionsActivity mTransactionsActivity;
 
+	@Rule public GrantPermissionRule animationPermissionsRule = GrantPermissionRule.grant(Manifest.permission.SET_ANIMATION_SCALE);
+
 	@ClassRule
 	public static DisableAnimationsRule disableAnimationsRule = new DisableAnimationsRule();