diff --git a/fe_block.module b/fe_block.module
index f233ce2..9dc5845 100644
--- a/fe_block.module
+++ b/fe_block.module
@@ -130,6 +130,10 @@ function fe_block_settings_features_export_render($module_name = '', $data) {
       $export_block['node_types'] = _fe_block_get_block_node_types($block);
       // Add role visibility settings.
       $export_block['roles'] = _fe_block_get_block_roles($block);
+      // Add block_class support.
+      if (module_exists('block_class')) {
+        $export_block['classes'] = _fe_block_get_block_classes($block);
+      }
       // Add theme specific settings for every active theme.
       $export_block['themes'] = array();
       foreach ($themes as $theme) {
@@ -433,9 +437,11 @@ function fe_block_settings_features_revert($module_name = NULL) {
     $block_themes = $block['themes'];
     $block_node_types = isset($block['node_types']) ? $block['node_types'] : NULL;
     $block_roles = isset($block['roles']) ? $block['roles'] : NULL;
+    $block_classes = isset($block['classes']) ? $block['classes'] : NULL;
     unset($block['themes']);
     unset($block['node_types']);
     unset($block['roles']);
+    unset($block['classes']);
 
     // Restore theme specific settings for every active theme.
     foreach ($active_themes as $theme) {
@@ -477,6 +483,11 @@ function fe_block_settings_features_revert($module_name = NULL) {
     if (isset($block_roles)) {
       _fe_block_settings_update_block_roles($block, $block_roles);
     }
+
+    // Update block classes.
+    if (isset($block_classes) && module_exists('block_class')) {
+      _fe_block_settings_update_block_classes($block, $block_classes);
+    }
   }
 
   // Clear block cache.
@@ -585,6 +596,37 @@ function _fe_block_settings_update_block_roles($block, $block_roles) {
 }
 
 /**
+ * Helper to update the block class settings for a given block.
+ *
+ * @param array $block
+ *   Block definition of the block to update.
+ * @param string $block_classes
+ *   List of classes to apply to the block.
+ */
+function _fe_block_settings_update_block_classes($block, $block_classes) {
+  // This functionality is provided by the Block Class module.
+  if (module_exists('block_class')) {
+    // First delete the old block_class settings, if any.
+    db_delete('block_class')
+      ->condition('module', $block['module'])
+      ->condition('delta', $block['delta'])
+      ->execute();
+
+    // Then write the new settings, if any are present.
+    if (!empty($block_classes)) {
+      db_insert('block_class')
+        ->fields(array('module', 'delta', 'css_class'))
+        ->values(array(
+            'module' => $block['module'],
+            'delta' => $block['delta'],
+            'css_class' => $block_classes,
+          ))
+        ->execute();
+    }
+  }
+}
+
+/**
  * Implements hook_features_disable_feature().
  */
 function fe_block_settings_features_disable_feature($module) {
@@ -1039,6 +1081,34 @@ function _fe_block_get_block_roles($block) {
 }
 
 /**
+ * Helper function to get block class settings.
+ *
+ * @param array $block
+ *   The block definition.
+ *
+ * @return string
+ *   Class name(s) for the block.
+ */
+function _fe_block_get_block_classes($block) {
+  $result = '';
+
+  // This functionality depends on the Block Class module.
+  if (module_exists('block_class')) {
+    $classes = db_select('block_class', 'b')
+      ->fields('b', array('css_class'))
+      ->condition('module', $block['module'])
+      ->condition('delta', $block['delta'])
+      ->execute()
+      ->fetchField();
+
+    if (!empty($classes)) {
+      $result = $classes;
+    }
+  }
+  return $result;
+}
+
+/**
  * Helper function to convert an older export into the new format.
  *
  * @param array $defaults
diff --git a/tests/fe_block.test b/tests/fe_block.test
index cb6afb2..2704352 100644
--- a/tests/fe_block.test
+++ b/tests/fe_block.test
@@ -6,7 +6,7 @@
  */
 
 /**
- * Tests the custom block functionality.
+ * Tests the functionality of FE Block.
  */
 class FeaturesExtraBlockTestCase extends DrupalWebTestCase {
   // The installation profile that will be used to run the tests.
@@ -14,8 +14,8 @@ class FeaturesExtraBlockTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
-      'name' => 'Install, revert and override',
-      'description' => 'Tests if a feature containing blocks and block settings can be installed, reverted and detected as being overridden.',
+      'name' => 'FE Block',
+      'description' => 'Tests Features integration for blocks and block settings.',
       'group' => 'Features Extra',
     );
   }
@@ -35,6 +35,7 @@ class FeaturesExtraBlockTestCase extends DrupalWebTestCase {
   public function testRequiredModules() {
     $required_modules = array(
       'block',
+      'block_class',
       'ctools',
       'features',
       'fe_block',
@@ -103,4 +104,14 @@ class FeaturesExtraBlockTestCase extends DrupalWebTestCase {
       ->condition('theme', 'bartik')
       ->execute();
   }
+
+  /**
+   * Tests the integration with the Block Class module.
+   *
+   * @see http://www.drupal.org/node/1342996
+   */
+  public function testBlockClass() {
+    $this->drupalGet('<front>');
+    $this->assertRaw('test-class', 'The class set by the Block Class module has been found.');
+  }
 }
diff --git a/tests/features_extra_test.features.fe_block_boxes.inc b/tests/features_extra_test.features.fe_block_boxes.inc
index 96974e1..8596f61 100644
--- a/tests/features_extra_test.features.fe_block_boxes.inc
+++ b/tests/features_extra_test.features.fe_block_boxes.inc
@@ -12,7 +12,7 @@ function features_extra_test_default_fe_block_boxes() {
 
   $fe_block_boxes = new stdClass();
   $fe_block_boxes->info = 'Features Extra Test Block';
-  $fe_block_boxes->format = 'filtered_html';
+  $fe_block_boxes->format = 'plain_text';
   $fe_block_boxes->machine_name = 'features_extra_test_block';
   $fe_block_boxes->body = 'This block is used in automated testing for the Features Extra module.';
 
diff --git a/tests/features_extra_test.features.fe_block_settings.inc b/tests/features_extra_test.features.fe_block_settings.inc
index b0ceed7..1c44738 100644
--- a/tests/features_extra_test.features.fe_block_settings.inc
+++ b/tests/features_extra_test.features.fe_block_settings.inc
@@ -14,6 +14,7 @@ function features_extra_test_default_fe_block_settings() {
 
   $export['block-features_extra_test_block'] = array(
     'cache' => -1,
+    'classes' => 'test-class',
     'custom' => '0',
     'machine_name' => 'features_extra_test_block',
     'module' => 'block',
diff --git a/tests/features_extra_test.info b/tests/features_extra_test.info
index 542b2c6..c964c27 100644
--- a/tests/features_extra_test.info
+++ b/tests/features_extra_test.info
@@ -2,9 +2,8 @@ name = Features Extra test feature
 description = Test feature for Features Extra
 core = 7.x
 package = Testing
-
+dependencies[] = block_class
 dependencies[] = fe_block
-
 features[fe_block_boxes][] = features_extra_test_block
 features[fe_block_settings][] = block-features_extra_test_block
 features[features_api][] = api:1