diff --git a/modules/simpletest/tests/entity_query.test b/modules/simpletest/tests/entity_query.test
index fb95518..881029c 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