diff --git a/modules/simpletest/tests/theme.test b/modules/simpletest/tests/theme.test
index f5ddfa9..809e2f8 100644
--- a/modules/simpletest/tests/theme.test
+++ b/modules/simpletest/tests/theme.test
@@ -101,7 +101,10 @@ class ThemeTestCase extends DrupalWebTestCase {
     // test theme. First we test with CSS aggregation disabled.
     variable_set('preprocess_css', 0);
     $this->drupalGet('theme-test/suggestion');
-    $this->assertNoText('system.base.css', 'The theme\'s .info file is able to override a module CSS file from being added to the page.');
+    $module = drupal_get_path('module', 'simpletest');
+    $this->assertNoText($module . '/tests/system.base.css');
+    $theme = drupal_get_path('theme', 'test_theme');
+    $this->assertNoText($theme . '/system.base.css', 'The theme\'s .info file is able to override a module CSS file from being added to the page.');
 
     // Also test with aggregation enabled, simply ensuring no PHP errors are
     // triggered during drupal_build_css_cache() when a source file doesn't
diff --git a/modules/user/user.test b/modules/user/user.test
index 63143c3..192ee2c 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -2369,7 +2369,9 @@ class UserUserSearchTestCase extends DrupalWebTestCase {
     $this->drupalLogin($user1);
     $edit = array('keys' => $blocked_user->name);
     $this->drupalPost('search/user/', $edit, t('Search'));
-    $this->assertNoText($blocked_user->name, 'Blocked users are hidden from the user search results.');
+    global $base_url;
+    $this->assertNoRaw('<a href="' . $base_url . '/user/' . $blocked_user->uid . '">' . $blocked_user->name . '(' . $blocked_user->name . '@example.com)</a>', 'Blocked users are hidden from the user search results.');
+    $this->assertText('Your search yielded no results');
 
     $this->drupalLogout();
   }