diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index 3ed19bd55b..7754864a69 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -108,6 +108,33 @@ class TestRepairMimeTypes extends PHPUnit_Framework_TestCase {
 		);
 	}
 
+	/**
+	 * Test renaming the APK mime type
+	 */
+	public function testRenameAPKMimeType() {
+		$this->addEntries(
+			array(
+				array('test.apk', 'application/octet-stream'),
+				array('bogus.apk', 'application/vnd.android.package-archive'),
+				array('bogus2.apk', 'application/wrong'),
+			)
+		);
+
+		$this->repair->run();
+
+		// force mimetype reload
+		DummyFileCache::clearCachedMimeTypes();
+		$this->storage->getCache()->loadMimeTypes();
+
+		$this->checkEntries(
+			array(
+				array('test.apk', 'application/vnd.android.package-archive'),
+				array('bogus.apk', 'application/vnd.android.package-archive'),
+				array('bogus2.apk', 'application/vnd.android.package-archive'),
+			)
+		);
+	}
+
 	/**
 	 * Test renaming and splitting old office mime types when
 	 * new ones already exist