diff --git modules/simpletest/tests/entity_cache_test.module modules/simpletest/tests/entity_cache_test.module
index acafca1..5728567 100644
--- modules/simpletest/tests/entity_cache_test.module
+++ modules/simpletest/tests/entity_cache_test.module
@@ -9,14 +9,17 @@
 /**
  * Implements hook_watchdog().
  *
- * This function is called during module_enable() and tries to access entity
- * information provided by the module this one depends on. The information is
- * stored in a temporary system variable and is later analyzed in the test
- * case.
+ * This hook is called during module_enable() and tries to access entity
+ * information provided by the module this one depends on, which should be
+ * available. The information is stored in a temporary system variable and is
+ * later analyzed in the test case.
  *
  * @see EnableDisableTestCase::testEntityCache()
+ * @see entity_cache_test_dependency_entity_info()
  */
-function entity_cache_test_watchdog() {
-  $info = entity_get_info('entity_cache_test');
-  variable_set('entity_cache_test', $info);
+function entity_cache_test_watchdog($log_entry) {
+  if ($log_entry['type'] == 'system' && $log_entry['message'] == '%module module installed.') {
+    $info = entity_get_info('entity_cache_test');
+    variable_set('entity_cache_test', $info);
+  }
 }
diff --git modules/system/system.test modules/system/system.test
index 3cc68d6..2a4e8fc 100644
--- modules/system/system.test
+++ modules/system/system.test
@@ -161,11 +161,14 @@ class EnableDisableTestCase extends ModuleTestCase {
   /**
    * Tests entity cache after enabling a module with a dependency on an enitity
    * providing module.
+   *
+   * @see entity_cache_test_watchdog()
    */
   function testEntityCache() {
     module_enable(array('entity_cache_test'));
     $info = variable_get('entity_cache_test');
-    $this->assertNotNull($info, t('Entity information must not be NULL'));
+    $this->assertEqual($info['label'], 'Entity Cache Test', 'Entity info label is correct.');
+    $this->assertEqual($info['controller class'], 'DrupalDefaultEntityController', 'Entity controller class info is correct.');
   }
 }