Index: wp-testcase/test_user_capabilities.php
===================================================================
--- wp-testcase/test_user_capabilities.php	(revision 289)
+++ wp-testcase/test_user_capabilities.php	(working copy)
@@ -122,13 +122,15 @@
 	// a role that doesn't exist
 	function test_bogus_role() {
 		_disable_wp_die();
-		$id = $this->_make_user(rand_str());
+		$id   = $this->_make_user($role = rand_str());
+		$died = _enable_wp_die();
+		$this->assertTrue($died); // creating the user should have made the script died.		
+				
 		$user = new WP_User($id);
 
 		// user has no role and no capabilities
 		$this->assertEquals(array(), $user->roles);
-		$this->assertFalse($user->has_cap('level_0'));
-		_enable_wp_die();
+		$this->assertFalse($user->has_cap('level_0'));		
 	}
 
 	// a user with multiple roles
Index: wp-testlib/utils.php
===================================================================
--- wp-testlib/utils.php	(revision 289)
+++ wp-testlib/utils.php	(working copy)
@@ -307,15 +307,18 @@
 		_default_wp_die_handler( $message, $title, $args );
 	} else {
 		//Ignore at our peril
+		$GLOBALS['_wp_die_disabled_died'] = true;
 	}
 }
 
 function _disable_wp_die() {
-	$GLOBALS['_wp_die_disabled'] = true;
+	$GLOBALS['_wp_die_disabled']      = true;
+	$GLOBALS['_wp_die_disabled_died'] = false;
 }
 
-function _enable_wp_die() {
+function _enable_wp_die() {	
 	$GLOBALS['_wp_die_disabled'] = false;
+	return $GLOBALS['_wp_die_disabled_died'];
 }
 
 function _wp_die_handler_filter() {