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