diff --git a/F-Droid/test/assets/README.md b/F-Droid/test/assets/README.md
new file mode 100644
index 000000000..ea34d0a14
--- /dev/null
+++ b/F-Droid/test/assets/README.md
@@ -0,0 +1,50 @@
+# Multiple Repos Test
+
+This covers the three indexes:
+ * multiRepo.normal.jar
+ * multiRepo.archive.jar
+ * multiRepo.conflicting.jar
+
+The goal is that F-Droid client should be able to:
+
+ * Update all three repos successfully
+ * Show all included versions for download in the UI
+ * Somehow deal nicely with the fact that two repos provide versions 50-53 of AdAway
+
+## multiRepo.normal.jar
+
+ * 2048 (com.uberspot.a2048)
+   - Version 1.96 (19)
+   - Version 1.95 (18)
+ * AdAway (org.adaway)
+   - Version 3.0.2 (54)
+   - Version 3.0.1 (53)
+   - Version 3.0 (52)
+ * adbWireless (siir.es.adbWireless)
+   - Version 1.5.4 (12)
+
+## multiRepo.archive.jar
+
+ * AdAway (org.adaway)
+   - Version 2.9.2 (51)
+   - Version 2.9.1 (50)
+   - Version 2.9 (49)
+   - Version 2.8.1 (48)
+   - Version 2.7 (46)
+   - Version 2.6 (45)
+   - Version 2.3 (42)
+   - Version 2.1 (40)
+   - Version 1.37 (37)
+   - Version 1.35 (36)
+   - Version 1.34 (35)
+
+## multiRepo.conflicting.jar
+
+ * AdAway (org.adaway)
+   - Version 3.0.1 (53)
+   - Version 3.0 (52)
+   - Version 2.9.2 (51)
+   - Version 2.2.1 (50)
+ * Add to calendar (org.dgtale.icsimport)
+   - Version 1.2 (3)
+   - Version 1.1 (2)
\ No newline at end of file
diff --git a/F-Droid/test/assets/multiRepo.archive.jar b/F-Droid/test/assets/multiRepo.archive.jar
new file mode 100644
index 000000000..f5c505c07
Binary files /dev/null and b/F-Droid/test/assets/multiRepo.archive.jar differ
diff --git a/F-Droid/test/assets/multiRepo.conflicting.jar b/F-Droid/test/assets/multiRepo.conflicting.jar
new file mode 100644
index 000000000..6d26f65d3
Binary files /dev/null and b/F-Droid/test/assets/multiRepo.conflicting.jar differ
diff --git a/F-Droid/test/assets/multiRepo.normal.jar b/F-Droid/test/assets/multiRepo.normal.jar
new file mode 100644
index 000000000..6a53256eb
Binary files /dev/null and b/F-Droid/test/assets/multiRepo.normal.jar differ
diff --git a/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java
new file mode 100644
index 000000000..d3efcb624
--- /dev/null
+++ b/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java
@@ -0,0 +1,136 @@
+
+package org.fdroid.fdroid;
+
+import android.content.Context;
+import android.test.InstrumentationTestCase;
+
+import org.fdroid.fdroid.RepoUpdater.UpdateException;
+import org.fdroid.fdroid.data.Repo;
+
+import java.io.File;
+import java.util.UUID;
+
+public class MultiRepoUpdaterTest extends InstrumentationTestCase {
+    private static final String TAG = "RepoUpdaterTest";
+
+    private Context context;
+    private RepoUpdater conflictingRepoUpdater;
+    private RepoUpdater mainRepoUpdater;
+    private RepoUpdater archiveRepoUpdater;
+    private File testFilesDir;
+
+    private static final String PUB_KEY =
+            "3082050b308202f3a003020102020420d8f212300d06092a864886f70d01010b050030363110300e0603" +
+            "55040b1307462d44726f69643122302006035504031319657073696c6f6e2e70657465722e7365727779" +
+            "6c6f2e636f6d301e170d3135303931323233313632315a170d3433303132383233313632315a30363110" +
+            "300e060355040b1307462d44726f69643122302006035504031319657073696c6f6e2e70657465722e73" +
+            "657277796c6f2e636f6d30820222300d06092a864886f70d01010105000382020f003082020a02820201" +
+            "00b21fe72b84ce721967851364bd20511088d117bc3034e4bb4d3c1a06af2a308fdffdaf63b12e0926b9" +
+            "0545134b9ff570646cbcad89d9e86dcc8eb9977dd394240c75bccf5e8ddc3c5ef91b4f16eca5f36c36f1" +
+            "92463ff2c9257d3053b7c9ecdd1661bd01ec3fe70ee34a7e6b92ddba04f258a32d0cfb1b0ce85d047180" +
+            "97fc4bdfb54541b430dfcfc1c84458f9eb5627e0ec5341d561c3f15f228379a1282d241329198f31a7ac" +
+            "cd51ab2bbb881a1da55001123483512f77275f8990c872601198065b4e0137ddd1482e4fdefc73b857d4" +
+            "be324ca96c268ceb725398f8cc38a0dc6aa2c277f8686724e8c7ff3f320a05791fccacc6caa956cf23a9" +
+            "de2dc7070b262c0e35d90d17e90773bb11e875e79a8dfd958e359d5d5ad903a7cbc2955102502bd0134c" +
+            "a1ff7a0bbbbb57302e4a251e40724dcaa8ad024f4b3a71b8fceaac664c0dcc1995a1c4cf42676edad8bc" +
+            "b03ba255ab796677f18fff2298e1aaa5b134254b44d08a4d934c9859af7bbaf078c37b7f628db0e2cffb" +
+            "0493a669d5f4770d35d71284550ce06d6f6811cd2a31585085716257a4ba08ad968b0a2bf88f34ca2f2c" +
+            "73af1c042ab147597faccfb6516ef4468cfa0c5ab3c8120eaa7bac1080e4d2310f717db20815d0e1ee26" +
+            "bd4e47eed8d790892017ae9595365992efa1b7fd1bc1963f018264b2b3749b8f7b1907bb0843f1e7fc2d" +
+            "3f3b02284cd4bae0ab0203010001a321301f301d0603551d0e0416041456110e4fed863ab1df9448bfd9" +
+            "e10a8bc32ffe08300d06092a864886f70d01010b050003820201008082572ae930ebc55ecf1110f4bb72" +
+            "ad2a952c8ac6e65bd933706beb4a310e23deabb8ef6a7e93eea8217ab1f3f57b1f477f95f1d62eccb563" +
+            "67a4d70dfa6fcd2aace2bb00b90af39412a9441a9fae2396ff8b93de1df3d9837c599b1f80b7d75285cb" +
+            "df4539d7dd9612f54b45ca59bc3041c9b92fac12753fac154d12f31df360079ab69a2d20db9f6a7277a8" +
+            "259035e93de95e8cbc80351bc83dd24256183ea5e3e1db2a51ea314cdbc120c064b77e2eb3a731530511" +
+            "1e1dabed6996eb339b7cb948d05c1a84d63094b4a4c6d11389b2a7b5f2d7ecc9a149dda6c33705ef2249" +
+            "58afdfa1d98cf646dcf8857cd8342b1e07d62cb4313f35ad209046a4a42ff73f38cc740b1e695eeda49d" +
+            "5ea0384ad32f9e3ae54f6a48a558dbc7cccabd4e2b2286dc9c804c840bd02b9937841a0e48db00be9e3c" +
+            "d7120cf0f8648ce4ed63923f0352a2a7b3b97fc55ba67a7a218b8c0b3cda4a45861280a622e0a59cc9fb" +
+            "ca1117568126c581afa4408b0f5c50293c212c406b8ab8f50aad5ed0f038cfca580ef3aba7df25464d9e" +
+            "495ffb629922cfb511d45e6294c045041132452f1ed0f20ac3ab4792f610de1734e4c8b71d743c4b0101" +
+            "98f848e0dbfce5a0f2da0198c47e6935a47fda12c518ef45adfb66ddf5aebaab13948a66c004b8592d22" +
+            "e8af60597c4ae2977977cf61dc715a572e241ae717cafdb4f71781943945ac52e0f50b";
+
+    @Override
+    protected void setUp() {
+        context = getInstrumentation().getContext();
+        testFilesDir = TestUtils.getWriteableDir(getInstrumentation());
+        conflictingRepoUpdater = createUpdater(context);
+        mainRepoUpdater = createUpdater(context);
+        archiveRepoUpdater = createUpdater(context);
+    }
+
+    /**
+     * Check that a sample of expected apps and apk versions are available in the database.
+     * Also check that the AdAway apks versions 50-53 are as expected, given that 50 was in
+     * both conflicting and archive repo, and 51-53 were in both conflicting and main repo.
+     */
+    private void assertExpected() {
+
+    }
+
+    public void testConflictingThenMainThenArchive() throws UpdateException {
+        if (updateConflicting() && updateMain() && updateArchive()) {
+            assertExpected();
+        }
+    }
+
+    public void testConflictingThenArchiveThenMain() throws UpdateException {
+        if (updateConflicting() && updateArchive() && updateMain()) {
+            assertExpected();
+        }
+    }
+
+    public void testArchiveThenMainThenConflicting() throws UpdateException {
+        if (updateArchive() && updateMain() && updateConflicting()) {
+            assertExpected();
+        }
+    }
+
+    public void testArchiveThenConflictingThenMain() throws UpdateException {
+        if (updateArchive() && updateConflicting() && updateMain()) {
+            assertExpected();
+        }
+    }
+
+    public void testMainThenArchiveThenConflicting() throws UpdateException {
+        if (updateMain() && updateArchive() && updateConflicting()) {
+            assertExpected();
+        }
+    }
+
+    public void testMainThenConflictingThenArchive() throws UpdateException {
+        if (updateMain() && updateConflicting() && updateArchive()) {
+            assertExpected();
+        }
+    }
+
+    private RepoUpdater createUpdater(Context context) {
+        Repo repo = new Repo();
+        repo.pubkey = PUB_KEY;
+        return new RepoUpdater(context, repo);
+    }
+
+    private boolean updateConflicting() throws UpdateException {
+        return updateRepo(conflictingRepoUpdater, "multiRepo.conflicting.jar");
+    }
+
+    private boolean updateMain() throws UpdateException {
+        return updateRepo(mainRepoUpdater, "multiRepo.normal.jar");
+    }
+
+    private boolean updateArchive() throws UpdateException {
+        return updateRepo(archiveRepoUpdater, "multiRepo.archive.jar");
+    }
+
+    private boolean updateRepo(RepoUpdater updater, String indexJarPath) throws UpdateException {
+        if (!testFilesDir.canWrite())
+            return false;
+
+        File indexJar = TestUtils.copyAssetToDir(context, indexJarPath, testFilesDir);
+        updater.processDownloadedFile(indexJar, UUID.randomUUID().toString());
+        return true;
+    }
+
+}