diff --git a/prepare.py b/prepare.py
index 369c18d8f..fe64e39f3 100755
--- a/prepare.py
+++ b/prepare.py
@@ -366,8 +366,10 @@ run-liblinphone-tests:
 \tmake run-all-tests
 
 run-all-tests: clean install
+\tpatch -p1 < test.patch
 \t./gradlew grantDebugPermissions
 \t./gradlew connectedAndroidTest
+\tpatch -Rp1 < test.patch
 
 pull-transifex:
 \ttx pull -af
diff --git a/test.patch b/test.patch
new file mode 100644
index 000000000..667714692
--- /dev/null
+++ b/test.patch
@@ -0,0 +1,23 @@
+diff --git a/AndroidManifest.xml b/AndroidManifest.xml
+index 9ee95b62..bb763a24 100755
+--- a/AndroidManifest.xml
++++ b/AndroidManifest.xml
+@@ -287,15 +287,15 @@
+             </intent-filter>
+         </service>
+ 
+-        <provider
++        <!--<provider
+             android:name="android.support.v4.content.FileProvider"
+-            android:authorities="org.linphone.provider"
++            android:authorities="org.linphone.provider${linphone_app_id}"
+             android:exported="false"
+             android:grantUriPermissions="true">
+             <meta-data
+                 android:name="android.support.FILE_PROVIDER_PATHS"
+                 android:resource="@xml/provider_paths"/>
+-        </provider>
++        </provider>-->
+ 
+         <activity
+             android:name=".tutorials.TutorialLauncherActivity"