diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
index 8d61b05..cddfd8a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
@@ -189,6 +189,30 @@ public function load() {
       'timezone_id',
     ))
     ->values(array(
+      'uid' => '1',
+      'name' => 'root',
+      'pass' => '63a9f0ea7bb98050796b649e85481845',
+      'mail' => '',
+      'mode' => '0',
+      'sort' => '0',
+      'threshold' => '0',
+      'theme' => '',
+      'signature' => '',
+      'signature_format' => '0',
+      'created' => '0',
+      'access' => '0',
+      'login' => '0',
+      'status' => '1',
+      'timezone' => NULL,
+      'language' => '',
+      'picture' => '',
+      'init' => '',
+      'data' => 'b:0;',
+      'timezone_name' => '',
+      'pass_plain' => '',
+      'expected_timezone' => NULL,
+      'timezone_id' => '0',
+    ))->values(array(
       'uid' => '2',
       'name' => 'john.doe',
       'pass' => '671cc45b3e2c6eb751d6a554dc5a5fe7',
@@ -312,4 +336,4 @@ public function load() {
   }
 
 }
-#4a42570fa3c819b0b84e9552d689e2e7
+#fabab3daf923bc111a54a35b8507d5a1
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Filter.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Filter.php
index d8b660d..bd5b41f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Filter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Filter.php
@@ -257,5 +257,4 @@ public function load() {
   }
 
 }
-
-#e0bd772d07df589752fa9372705aaa9d
+#16e3b041b7320bbdb47bda5cd2f57295
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php
index 47f80c3..a9ed7b0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php
@@ -141,6 +141,23 @@ public function load() {
       'data',
     ))
     ->values(array(
+      'uid' => '1',
+      'name' => 'root',
+      'pass' => '$S$D/HVkgCg1Hvi7DN5KVSgNl.2C5g8W6oe/OoIRMUlyjkmPugQRhoB',
+      'mail' => '',
+      'theme' => '',
+      'signature' => '',
+      'signature_format' => NULL,
+      'created' => '0',
+      'access' => '0',
+      'login' => '0',
+      'status' => '1',
+      'timezone' => NULL,
+      'language' => '',
+      'picture' => '0',
+      'init' => '',
+      'data' => 'a:1:{s:7:"contact";i:1;}',
+    ))->values(array(
       'uid' => '2',
       'name' => 'Odo',
       'pass' => '$S$DZ4P7zZOh92vgrgZDBbv8Pu6lQB337OJ1wsOy21602G4A5F7.M9K',
@@ -161,4 +178,4 @@ public function load() {
   }
 
 }
-#b33078324746c718e26c067131e97dcd
+#b8a27fc07ad0e18e5fded43f9d54e4f2
diff --git a/core/scripts/migrate-db.sh b/core/scripts/migrate-db.sh
index 16ed45a..c4141cd 100755
--- a/core/scripts/migrate-db.sh
+++ b/core/scripts/migrate-db.sh
@@ -391,7 +391,7 @@ function _db_field_type_map($sql_type) {
  */
 function _db_get_query($table) {
   $queries = array(
-    'users' => 'SELECT * FROM {users} WHERE uid NOT IN (0,1)',
+    'users' => 'SELECT * FROM {users} WHERE uid > 0',
     // Volatile state variables should always be ignored. We don't want to
     // exclude all cache_* variables, since that would exclude cache_lifetime,
     // which is configuration, not state.