diff --git a/core/modules/filter/filter.test b/core/modules/filter/filter.test
index bef1d7b..c951b6b 100644
--- a/core/modules/filter/filter.test
+++ b/core/modules/filter/filter.test
@@ -759,7 +759,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase {
     filter_format_save($filtered_html_format);
 
     $filtered_html_permission = filter_permission_name($filtered_html_format);
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array($filtered_html_permission));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_ROLE, array($filtered_html_permission));
 
     $this->admin_user = $this->drupalCreateUser(array('administer modules', 'administer filters', 'administer site configuration'));
     $this->drupalLogin($this->admin_user);
diff --git a/core/modules/simpletest/tests/form.test b/core/modules/simpletest/tests/form.test
index 582b473..53dea98 100644
--- a/core/modules/simpletest/tests/form.test
+++ b/core/modules/simpletest/tests/form.test
@@ -26,7 +26,7 @@ class FormsTestCase extends DrupalWebTestCase {
     filter_format_save($filtered_html_format);
 
     $filtered_html_permission = filter_permission_name($filtered_html_format);
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array($filtered_html_permission));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_ROLE, array($filtered_html_permission));
   }
 
   /**
diff --git a/core/modules/system/system.test b/core/modules/system/system.test
index 9287d16..976f713 100644
--- a/core/modules/system/system.test
+++ b/core/modules/system/system.test
@@ -900,8 +900,8 @@ class AccessDeniedTestCase extends DrupalWebTestCase {
     // Create an administrative user.
     $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer site configuration', 'administer blocks'));
 
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access user profiles'));
-    user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access user profiles'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_ROLE, array('access user profiles'));
+    user_role_grant_permissions(DRUPAL_AUTHENTICATED_ROLE, array('access user profiles'));
   }
 
   function testAccessDenied() {
@@ -977,8 +977,8 @@ class PageNotFoundTestCase extends DrupalWebTestCase {
     // Create an administrative user.
     $this->admin_user = $this->drupalCreateUser(array('administer site configuration'));
 
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access user profiles'));
-    user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access user profiles'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_ROLE, array('access user profiles'));
+    user_role_grant_permissions(DRUPAL_AUTHENTICATED_ROLE, array('access user profiles'));
   }
 
   function testPageNotFound() {
diff --git a/core/modules/user/user.test b/core/modules/user/user.test
index 1092376..61dfb3c 100644
--- a/core/modules/user/user.test
+++ b/core/modules/user/user.test
@@ -1732,7 +1732,7 @@ class UserSignatureTestCase extends DrupalWebTestCase {
     $this->full_html_format = (object) $full_html_format;
     filter_format_save($this->full_html_format);
 
-    user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array(filter_permission_name($this->filtered_html_format)));
+    user_role_grant_permissions(DRUPAL_AUTHENTICATED_ROLE, array(filter_permission_name($this->filtered_html_format)));
     $this->checkPermissions(array(), TRUE);
 
     // Create regular and administrative users.
diff --git a/profiles/testing/testing.install b/profiles/testing/testing.install
index bdd6154..2d11267 100644
--- a/profiles/testing/testing.install
+++ b/profiles/testing/testing.install
@@ -17,6 +17,6 @@ function testing_install() {
 
   // Enable default permissions for system roles.
   // @todo Remove dependency on Node module.
-  user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access content'));
-  user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access content'));
+  user_role_grant_permissions(DRUPAL_ANONYMOUS_ROLE, array('access content'));
+  user_role_grant_permissions(DRUPAL_AUTHENTICATED_ROLE, array('access content'));
 }