diff --git a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java
index 9a90600ad..e37dac891 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java
@@ -86,8 +86,10 @@ public class AppProviderTest extends FDroidProviderTest<AppProvider> {
         assertInvalidUri(AppProvider.getAuthority());
         assertInvalidUri(ApkProvider.getContentUri());
 
-        assertValidUri(AppProvider.getContentUri());
-        assertValidUri(AppProvider.getSearchUri("'searching!'"));
+        assertValidUri(AppProvider.getContentUri(), "content://org.fdroid.fdroid.data.AppProvider");
+        assertValidUri(AppProvider.getSearchUri("'searching!'"), "content://org.fdroid.fdroid.data.AppProvider/search/'searching!'");
+        assertValidUri(AppProvider.getSearchUri(""), "content://org.fdroid.fdroid.data.AppProvider");
+        assertValidUri(AppProvider.getSearchUri(null), "content://org.fdroid.fdroid.data.AppProvider");
         assertValidUri(AppProvider.getNoApksUri());
         assertValidUri(AppProvider.getInstalledUri());
         assertValidUri(AppProvider.getCanUpdateUri());
diff --git a/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java
index 3bf2ea8bb..76a803fdb 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java
@@ -131,6 +131,11 @@ public abstract class FDroidProviderTest<T extends FDroidProvider> extends Provi
         cursor.close();
     }
 
+    protected void assertValidUri(Uri actualUri, String expectedUri) {
+        assertValidUri(actualUri);
+        assertEquals(expectedUri, actualUri.toString());
+    }
+
     /**
      * Many queries need at least some sort of projection in order to produce
      * valid SQL. As such, we also need to know about that, so we can provide