diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php
index 268f2f3..b51c852 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php
@@ -95,17 +95,26 @@ public static function load(Connection $database) {
     $database->insert('permission')->fields(array('pid', 'rid', 'perm'))
       ->values(array('pid' => 3, 'rid' => 3, 'perm' => 'migrate test role 1 test permission'))
       ->values(array('pid' => 4, 'rid' => 4, 'perm' => 'migrate test role 2 test permission'))
-      ->values(array('pid' => 5, 'rid' => 5, 'perm' => 'migrate test role 3 test permission'))
+      ->values(array('pid' => 5, 'rid' => 4, 'perm' => 'use PHP for settings'))
+      ->values(array('pid' => 6, 'rid' => 4, 'perm' => 'administer contact forms'))
+      ->values(array('pid' => 7, 'rid' => 4, 'perm' => 'skip comment approval'))
+      ->values(array('pid' => 8, 'rid' => 4, 'perm' => 'edit own blog content'))
+      ->values(array('pid' => 9, 'rid' => 4, 'perm' => 'edit any blog content'))
+      ->values(array('pid' => 10, 'rid' => 4, 'perm' => 'delete own blog content'))
+      ->values(array('pid' => 11, 'rid' => 4, 'perm' => 'delete any blog content'))
+      ->values(array('pid' => 12, 'rid' => 4, 'perm' => 'create forum content'))
+      ->values(array('pid' => 13, 'rid' => 4, 'perm' => 'delete any forum content'))
+      ->values(array('pid' => 14, 'rid' => 4, 'perm' => 'delete own forum content'))
+      ->values(array('pid' => 15, 'rid' => 4, 'perm' => 'edit any forum content'))
+      ->values(array('pid' => 16, 'rid' => 4, 'perm' => 'edit own forum content'))
       ->execute();
     $database->insert('role')->fields(array('rid', 'name'))
       ->values(array('rid' => 3, 'name' => 'migrate test role 1'))
       ->values(array('rid' => 4, 'name' => 'migrate test role 2'))
-      ->values(array('rid' => 5, 'name' => 'migrate test role 3'))
       ->execute();
     $database->insert('users_roles')->fields(array('uid', 'rid'))
       ->values(array('uid' => 1, 'rid' => 3))
       ->values(array('uid' => 1, 'rid' => 4))
-      ->values(array('uid' => 1, 'rid' => 5))
       ->execute();
   }
 
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateD6UserRoleTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateD6UserRoleTest.php
index 2f2f833..d0e7fe3 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateD6UserRoleTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/MigrateD6UserRoleTest.php
@@ -10,6 +10,9 @@
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateMessage;
 
+/**
+ * Tests d6 user role migration.
+ */
 class MigrateD6UserRoleTest extends MigrateDrupalTestBase {
 
   /**
@@ -23,20 +26,37 @@ public static function getInfo() {
     );
   }
 
-  function testUserRole() {
+  /**
+   * Tests migrating d6 user roles.
+   */
+  public function testUserRole() {
     $migration = entity_load('migration', 'd6_user_role');
     $dumps = array(
       drupal_get_path('module', 'migrate_drupal') . '/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserRole.php',
     );
     $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage);
+    $executable = new MigrateExecutable($migration, new MigrateMessage());
     $executable->import();
-
-    $migrate_test_role = entity_load('user_role', 'migrate_test_role_1');
-    $this->assertTrue(is_object($migrate_test_role), 'The migrated role was retrieved from the database.');
-    $this->assertEqual($migrate_test_role->permissions, array(0 => 'migrate test role 1 test permission'));
-
-    // @todo: write better asserts.
+    $migrate_test_role_1 = entity_load('user_role', 'migrate_test_role_1');
+    $this->assertTrue(is_object($migrate_test_role_1), 'The migrated test role 1 was retrieved from the database.');
+    $this->assertEqual($migrate_test_role_1->permissions, array(0 => 'migrate test role 1 test permission'));
+    $migrate_test_role_2 = entity_load('user_role', 'migrate_test_role_2');
+    $this->assertTrue(is_object($migrate_test_role_2), 'The migrated test role 2 was retrieved from the database.');
+    $this->assertEqual($migrate_test_role_2->permissions, array(
+      0 => 'migrate test role 2 test permission',
+      1 => 'use PHP for settings',
+      2 => 'administer contact forms',
+      3 => 'skip comment approval',
+      4 => 'edit own blog content',
+      5 => 'edit any blog content',
+      6 => 'delete own blog content',
+      7 => 'delete any blog content',
+      8 => 'create forum content',
+      9 => 'delete any forum content',
+      10 => 'delete own forum content',
+      11 => 'edit any forum content',
+      12 => 'edit own forum content',
+    ));
   }
 
 }