diff --git modules/simpletest/simpletest.info modules/simpletest/simpletest.info
index 0f10636..3a8f2be 100644
--- modules/simpletest/simpletest.info
+++ modules/simpletest/simpletest.info
@@ -19,6 +19,7 @@ files[] = tests/bootstrap.test
 files[] = tests/cache.test
 files[] = tests/common.test
 files[] = tests/database_test.test
+files[] = tests/entity_cache.test
 files[] = tests/error.test
 files[] = tests/file.test
 files[] = tests/filetransfer.test
diff --git modules/simpletest/tests/entity_cache.test modules/simpletest/tests/entity_cache.test
new file mode 100644
index 0000000..2eeeb69
--- /dev/null
+++ modules/simpletest/tests/entity_cache.test
@@ -0,0 +1,31 @@
+<?php
+
+class EntityCacheTestCase extends ModuleTestCase {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Entity cache',
+      'description' => 'Tests entity cache after enabling modules.',
+      'group' => 'Entity',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('entity_cache_test');
+  }
+  
+  function testEnableWithoutDependency() {
+    $edit = array();
+    $edit['modules[Testing][entity_cache_test][enable]'] = 'entity_cache_test';
+    $this->drupalPost('admin/modules', $edit, t('Save configuration'));
+    $this->assertText(t('Some required modules must be enabled'), t('Dependecy required.'));
+
+    $this->assertModules(array('entity_cache_test', 'entity_cache_test_dependency'), FALSE);
+
+    $this->drupalPost(NULL, NULL, t('Continue'));
+    $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
+    $this->assertNoText('Fatal error: Call to undefined function entity_get_info()');
+
+    $this->assertModules(array('entity_cache_test', 'entity_cache_test_dependency'), TRUE);
+  }
+}
diff --git modules/simpletest/tests/entity_cache_test.info modules/simpletest/tests/entity_cache_test.info
new file mode 100644
index 0000000..2275fc4
--- /dev/null
+++ modules/simpletest/tests/entity_cache_test.info
@@ -0,0 +1,8 @@
+; $Id$
+name = "Entity cache test"
+description = "Support module for testing entity cache."
+package = Testing
+version = VERSION
+core = 7.x
+files[] = entity_cache_test.module
+dependencies[] = entity_cache_test_dependency
diff --git modules/simpletest/tests/entity_cache_test.module modules/simpletest/tests/entity_cache_test.module
new file mode 100644
index 0000000..b69e46d
--- /dev/null
+++ modules/simpletest/tests/entity_cache_test.module
@@ -0,0 +1,7 @@
+<?php
+// $Id$
+
+function entity_cache_test_watchdog() {
+  $info = entity_get_info('entity_cache_test');
+  variable_set('entity_cache_test', $info);
+}
diff --git modules/simpletest/tests/entity_cache_test_dependency.info modules/simpletest/tests/entity_cache_test_dependency.info
new file mode 100644
index 0000000..6379be0
--- /dev/null
+++ modules/simpletest/tests/entity_cache_test_dependency.info
@@ -0,0 +1,7 @@
+; $Id$
+name = "Entity cache test dependency"
+description = "Support dependency module for testing entity cache."
+package = Testing
+version = VERSION
+core = 7.x
+files[] = entity_cache_test_dependency.module
diff --git modules/simpletest/tests/entity_cache_test_dependency.module modules/simpletest/tests/entity_cache_test_dependency.module
new file mode 100644
index 0000000..664280b
--- /dev/null
+++ modules/simpletest/tests/entity_cache_test_dependency.module
@@ -0,0 +1,11 @@
+<?php
+// $Id$
+
+function entity_cache_test_dependency_entity_info() {
+  return array(
+    'entity_cache_test' => array(
+      'label' => 'Entity Cache Test',
+      'base table' => 'entity_cache_test',
+    ),
+  );
+}