diff --git a/features.module b/features.module
index 26815e8..63e51c5 100644
--- a/features.module
+++ b/features.module
@@ -849,6 +849,10 @@ function features_get_component_map($key = NULL, $reset = FALSE) {
     $map = array();
     $features = features_get_features(NULL, $reset);
     foreach ($features as $feature) {
+      // Skip hidden features.
+      if (!empty($feature->info['hidden'])) {
+        continue;
+      }
       foreach ($feature->info['features'] as $type => $components) {
         if (!isset($map[$type])) {
           $map[$type] = array();
diff --git a/tests/features_test/features_test.module b/tests/features_test/features_test.module
index 762d6e5..2850881 100644
--- a/tests/features_test/features_test.module
+++ b/tests/features_test/features_test.module
@@ -1,3 +1,17 @@
 <?php
 
 include_once('features_test.features.inc');
+
+/**
+ * Implements hook_system_info_alter().
+ */
+ function features_test_system_info_alter(&$info, $file, $type) {
+  // Don't run during installation.
+  if (variable_get('install_task') != 'done') {
+    return;
+  }
+  // Unhide the test module so tests can run properly.
+  if ($type == 'module' && in_array($file->name, array('features_test'))) {
+    $info['hidden'] = FALSE;
+  }
+}