2 files changed, 6 insertions, 4 deletions

diff --git a/src/mailman/database/alembic/versions/47294d3a604_pendable_indexes.py b/src/mailman/database/alembic/versions/47294d3a604_pendable_indexes.py
index b6e64c8bb..888a6544c 100644
--- a/src/mailman/database/alembic/versions/47294d3a604_pendable_indexes.py
+++ b/src/mailman/database/alembic/versions/47294d3a604_pendable_indexes.py
@@ -79,10 +79,6 @@ def upgrade():
 
 
 def downgrade():
-    op.drop_index(op.f('ix_pendedkeyvalue_value'), table_name='pendedkeyvalue')
-    op.drop_index(op.f('ix_pendedkeyvalue_key'), table_name='pendedkeyvalue')
-    op.drop_index(op.f('ix_pended_token'), table_name='pended')
-    op.drop_index(op.f('ix_pended_expiration_date'), table_name='pended')
     # Data migration.
     connection = op.get_bind()
     # Remove the introduced type keys.
@@ -97,3 +93,8 @@ def downgrade():
         connection.execute(keyvalue_table.update().where(
             keyvalue_table.c.id == keyvalue['id']
             ).values(value=json.dumps(keyvalue['value'])))
+    # Remove indexes
+    op.drop_index(op.f('ix_pendedkeyvalue_value'), table_name='pendedkeyvalue')
+    op.drop_index(op.f('ix_pendedkeyvalue_key'), table_name='pendedkeyvalue')
+    op.drop_index(op.f('ix_pended_token'), table_name='pended')
+    op.drop_index(op.f('ix_pended_expiration_date'), table_name='pended')
diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py
index 3140ed1ab..49686af01 100644
--- a/src/mailman/database/tests/test_migrations.py
+++ b/src/mailman/database/tests/test_migrations.py
@@ -157,6 +157,7 @@ class TestMigrations(unittest.TestCase):
         self.assertEqual(results[3]['type'], 'data')
         self.assertEqual(results[4]['type'], 'held message')
         self.assertEqual(results[5]['type'], 'registration')
+        config.db.store.commit()
         # Downgrading.
         alembic.command.downgrade(alembic_cfg, '33bc0099223')
         results = get_from_db()