diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
index ea4b8d3..bcddbf7 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
@@ -63,9 +63,12 @@ public function testBlockMigration() {
     $this->assertIdentical('<h3>My first custom block body</h3>', $block->body->value);
     $this->assertIdentical('full_html', $block->body->format);
 
+    // Take into account a non-default MySQL auto_increment_increment value.
+    $nextId = $this->container->get('database')->nextId();
+
     $block = BlockContent::load(2);
     $this->assertIdentical('My block 2', $block->label());
-    $this->assertIdentical('2', $block->getRevisionId());
+    $this->assertIdentical($nextId, $block->getRevisionId());
     $this->assertTrue(REQUEST_TIME <= $block->getChangedTime() && $block->getChangedTime() <= time());
     $this->assertIdentical('en', $block->language()->getId());
     $this->assertIdentical('<h3>My second custom block body</h3>', $block->body->value);