diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/System.php b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
index d0d9d9b..f6400cc 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
@@ -760,6 +760,28 @@ public function load() {
       'weight' => '0',
       'info' => 'a:10:{s:4:"name";s:14:"FileField Meta";s:11:"description";s:48:"Add metadata gathering and storage to FileField.";s:12:"dependencies";a:2:{i:0;s:9:"filefield";i:1;s:6:"getid3";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:3:"php";s:3:"5.0";s:7:"version";s:8:"6.x-3.11";s:7:"project";s:9:"filefield";s:9:"datestamp";s:10:"1365968724";s:10:"dependents";a:0:{}}',
     ))->values(array(
+      'filename' => 'sites/all/modules/imageapi/imageapi.module',
+      'name' => 'imageapi',
+      'type' => 'module',
+      'owner' => '',
+      'status' => '1',
+      'throttle' => '0',
+      'bootstrap' => '0',
+      'schema_version' => '0',
+      'weight' => '0',
+      'info' => 'a:10:{s:4:"name";s:8:"ImageAPI";s:11:"description";s:38:"ImageAPI supporting multiple toolkits.";s:7:"package";s:10:"ImageCache";s:4:"core";s:3:"6.x";s:3:"php";s:3:"5.1";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:8:"imageapi";s:9:"datestamp";s:10:"1305563215";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}}',
+    ))->values(array(
+      'filename' => 'sites/all/modules/imagecache/imagecache.module',
+      'name' => 'imagecache',
+      'type' => 'module',
+      'owner' => '',
+      'status' => '1',
+      'throttle' => '0',
+      'bootstrap' => '0',
+      'schema_version' => '6001',
+      'weight' => '0',
+      'info' => 'a:10:{s:4:"name";s:8:"ImageAPI";s:11:"description";s:38:"ImageAPI supporting multiple toolkits.";s:7:"package";s:10:"ImageCache";s:4:"core";s:3:"6.x";s:3:"php";s:3:"5.1";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:8:"imageapi";s:9:"datestamp";s:10:"1305563215";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}}',
+    ))->values(array(
       'filename' => 'sites/all/modules/imagefield/imagefield.module',
       'name' => 'imagefield',
       'type' => 'module',
@@ -848,28 +870,6 @@ public function load() {
       'weight' => '0',
       'info' => 'a:10:{s:4:"name";s:8:"Views UI";s:11:"description";s:93:"Administrative interface to views. Without this module, you cannot create or edit your views.";s:7:"package";s:5:"Views";s:4:"core";s:3:"6.x";s:12:"dependencies";a:1:{i:0;s:5:"views";}s:7:"version";s:7:"6.x-3.0";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1325638545";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
     ))->values(array(
-      'filename' => 'sites/all/modules/imageapi/imageapi.module',
-      'name' => 'imageapi',
-      'type' => 'module',
-      'owner' => '',
-      'status' => '1',
-      'throttle' => '0',
-      'bootstrap' => '0',
-      'schema_version' => '0',
-      'weight' => '0',
-      'info' => 'a:10:{s:4:"name";s:8:"ImageAPI";s:11:"description";s:38:"ImageAPI supporting multiple toolkits.";s:7:"package";s:10:"ImageCache";s:4:"core";s:3:"6.x";s:3:"php";s:3:"5.1";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:8:"imageapi";s:9:"datestamp";s:10:"1305563215";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}}',
-    ))->values(array(
-      'filename' => 'sites/all/modules/imagecache/imagecache.module',
-      'name' => 'imagecache',
-      'type' => 'module',
-      'owner' => '',
-      'status' => '1',
-      'throttle' => '0',
-      'bootstrap' => '0',
-      'schema_version' => '6001',
-      'weight' => '0',
-      'info' => 'a:10:{s:4:"name";s:8:"ImageAPI";s:11:"description";s:38:"ImageAPI supporting multiple toolkits.";s:7:"package";s:10:"ImageCache";s:4:"core";s:3:"6.x";s:3:"php";s:3:"5.1";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:8:"imageapi";s:9:"datestamp";s:10:"1305563215";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}}',
-    ))->values(array(
       'filename' => 'themes/bluemarine/bluemarine.info',
       'name' => 'bluemarine',
       'type' => 'theme',
@@ -939,4 +939,4 @@ public function load() {
   }
 
 }
-#f7d26efda87933cbe199c1f232d329b2
+#67a0176adb132bf6a171a703fa411e49
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..d8661dd 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,54 @@ public function load() {
       'timezone_id',
     ))
     ->values(array(
+      'uid' => '0',
+      'name' => '',
+      'pass' => '',
+      'mail' => '',
+      'mode' => '0',
+      'sort' => '0',
+      'threshold' => '0',
+      'theme' => '',
+      'signature' => '',
+      'signature_format' => '0',
+      'created' => '0',
+      'access' => '0',
+      'login' => '0',
+      'status' => '0',
+      'timezone' => NULL,
+      'language' => '',
+      'picture' => '',
+      'init' => '',
+      'data' => NULL,
+      'timezone_name' => '',
+      'pass_plain' => '',
+      'expected_timezone' => NULL,
+      'timezone_id' => '0',
+    ))->values(array(
+      'uid' => '1',
+      'name' => 'admin',
+      'pass' => '21232f297a57a5a743894a0e4a801fc3',
+      'mail' => 'admin@example.com',
+      'mode' => '0',
+      'sort' => '0',
+      'threshold' => '0',
+      'theme' => '',
+      'signature' => '',
+      'signature_format' => '2',
+      'created' => '1251998101',
+      'access' => '1391259672',
+      'login' => '1391152253',
+      'status' => '1',
+      'timezone' => '-28800',
+      'language' => '',
+      'picture' => 'sites/default/files/pictures/picture-1.jpg',
+      'init' => 'admin@example.com',
+      'data' => 'a:2:{s:7:"contact";i:0;s:13:"form_build_id";s:48:"form-9fhwzCXaE9syOWTse8nYyZU4CEuPrLzQmD3IizYvlfg";}',
+      'timezone_name' => 'America/Los_Angeles',
+      'pass_plain' => '',
+      'expected_timezone' => NULL,
+      'timezone_id' => '0',
+    ))->values(array(
       'uid' => '2',
       'name' => 'john.doe',
       'pass' => '671cc45b3e2c6eb751d6a554dc5a5fe7',
@@ -312,4 +360,4 @@ public function load() {
   }
 
 }
-#4a42570fa3c819b0b84e9552d689e2e7
+#bc2df2a8242b65ce359eda315e3d0839
diff --git a/core/scripts/migrate-db.sh b/core/scripts/migrate-db.sh
index 16ed45a..e317b0e 100755
--- a/core/scripts/migrate-db.sh
+++ b/core/scripts/migrate-db.sh
@@ -391,7 +391,6 @@ function _db_field_type_map($sql_type) {
  */
 function _db_get_query($table) {
   $queries = array(
-    'users' => 'SELECT * FROM {users} WHERE uid NOT IN (0,1)',
     // 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.