diff --git a/libraries/entropy/db/__init__.py b/libraries/entropy/db/__init__.py
index 9726d96c0..9d80eb718 100644
--- a/libraries/entropy/db/__init__.py
+++ b/libraries/entropy/db/__init__.py
@@ -4801,6 +4801,7 @@ class EntropyRepository(EntropyRepositoryBase):
         self._createProvidedLibsIndex()
         self._createDesktopMimeIndex()
         self._createProvidedMimeIndex()
+        self._cursor().execute("ANALYZE")
 
     def _createMirrorlinksIndex(self):
         if self.indexing:
diff --git a/libraries/tests/db.py b/libraries/tests/db.py
index 8dd64a8a4..4980a69c6 100644
--- a/libraries/tests/db.py
+++ b/libraries/tests/db.py
@@ -625,6 +625,9 @@ class EntropyRepositoryTest(unittest.TestCase):
         out = self.test_db.searchName(_misc.get_test_package_name())
         self.assertEqual(out, (('sys-libs/zlib-1.2.3-r1', 1),))
 
+    def test_db_indexes(self):
+        self.test_db.createAllIndexes()
+
     def test_db_import_export(self):
 
         test_pkg = _misc.get_test_package2()