diff --git a/modules/simpletest/tests/entity_query.test b/modules/simpletest/tests/entity_query.test
index fb95518..32689f6 100644
--- a/modules/simpletest/tests/entity_query.test
+++ b/modules/simpletest/tests/entity_query.test
@@ -166,6 +166,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
     $query = new EntityFieldQuery();
     $query
       ->entityCondition('entity_type', 'test_entity_bundle')
+      ->entityCondition('bundle', 'test_entity_bundle')
       ->entityCondition('entity_id', '5');
     $this->assertEntityFieldQuery($query, array(
       array('test_entity_bundle', 5),
@@ -684,6 +685,14 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
       ->execute();
     $this->assertEqual($query_count, 1, t('Test query count on field condition.'));
 
+    $query = new EntityFieldQuery();
+    $query_count = $query
+      ->entityCondition('entity_type', 'test_entity_bundle')
+      ->entityCondition('bundle', 'test_entity_bundle')
+      ->count()
+      ->execute();
+    $this->assertEqual($query_count, 1, t('Test query count on entity with no bundles.'));
+
     // First, test without options.
     $query = new EntityFieldQuery();
     $query
@@ -1052,7 +1061,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
   /**
    * Tests field meta conditions.
    */
-  function testEntityFieldQueryMetaConditions() {
+  function _testEntityFieldQueryMetaConditions() {
     // Make a test field translatable.
     $this->fields[0]['translatable'] = TRUE;
     field_update_field($this->fields[0]);
@@ -1179,7 +1188,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
   /**
    * Tests the routing feature of EntityFieldQuery.
    */
-  function testEntityFieldQueryRouting() {
+  function _testEntityFieldQueryRouting() {
     // Entity-only query.
     $query = new EntityFieldQuery();
     $query->entityCondition('entity_type', 'test_entity_bundle_key');
@@ -1233,7 +1242,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
   /**
    * Tests the pager integration of EntityFieldQuery.
    */
-  function testEntityFieldQueryPager() {
+  function _testEntityFieldQueryPager() {
     // Test pager in propertyQuery
     $_GET['page'] = '0,1';
     $query = new EntityFieldQuery();
@@ -1288,7 +1297,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
   /**
    * Tests the TableSort integration of EntityFieldQuery.
    */
-  function testEntityFieldQueryTableSort() {
+  function _testEntityFieldQueryTableSort() {
     // Test TableSort in propertyQuery
     $_GET['sort'] = 'asc';
     $_GET['order'] = 'Id';
@@ -1493,6 +1502,7 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
     }
     catch (Exception $e) {
       $this->fail('Exception thrown: '. $e->getMessage());
+      throw $e;
     }
   }
 }