diff -u b/modules/block/block.module b/modules/block/block.module
--- b/modules/block/block.module
+++ b/modules/block/block.module
@@ -853,11 +853,9 @@
       else {
         $array = module_invoke($block->module, 'block_view', $block->delta);
 
-        // Valid PHP function names cannot contain hyphens.
-        $delta = str_replace('-', '_', $block->delta);
         // Allow modules to modify the block before it is viewed, via either
         // hook_block_view_alter() or hook_block_view_MODULE_DELTA_alter().
-        drupal_alter(array('block_view', "block_view_{$block->module}_{$delta}"), $array, $block);
+        drupal_alter(array('block_view', "block_view_{$block->module}_{$block->delta}"), $array, $block);
 
         if (isset($cid)) {
           cache_set($cid, $array, 'cache_block', CACHE_TEMPORARY);
@@ -882,9 +880,11 @@
       else {
         $array = module_invoke($block->module, 'block_view', $block->delta);
 
+        // Valid PHP function names cannot contain hyphens.
+        $delta = str_replace('-', '_', $block->delta);
         // Allow modules to modify the block before it is viewed, via either
         // hook_block_view_alter() or hook_block_view_MODULE_DELTA_alter().
-        drupal_alter(array('block_view', "block_view_{$block->module}_{$block->delta}"), $array, $block);
+        drupal_alter(array('block_view', "block_view_{$block->module}_{$delta}"), $array, $block);
 
         if (isset($cid)) {
           cache_set($cid, $array, 'cache_block', CACHE_TEMPORARY);
diff -u b/modules/block/block.test b/modules/block/block.test
--- b/modules/block/block.test
+++ b/modules/block/block.test
@@ -755,7 +755,8 @@
 /**
  * Unit tests for hook_block_view_MODULE_DELTA_alter().
  */
-class BlockViewModuleDeltaAlterUnitTest extends DrupalWebTestCase {
+class BlockViewModuleDeltaAlterWebTest extends DrupalWebTestCase {
+
   public static function getInfo() {
     return array(
       'name' => 'Block view module delta alter',
@@ -764,7 +765,7 @@
     );
   }
 
-  function setUp() {
+  public function setUp() {
     parent::setUp(array('block_test'));
   }
 
@@ -772,7 +773,7 @@
    * Test if hook_block_view_MODULE_DELTA_alter() is called, even if the delta
    * contains a hyphen.
    */
-  function testBlockViewModuleDeltaAlter() {
+  public function testBlockViewModuleDeltaAlter() {
     $block = new stdClass;
     $block->module = 'block_test';
     $block->delta = 'test_underscore';
@@ -789,6 +790,7 @@
     $test_hyphen = $render->content['#markup'];
     $this->assertEqual($test_hyphen, 'hook_block_view_MODULE_DELTA_alter', 'Hyphens (-) in block delta were replaced by underscore (_)');
   }
+
 }
 
 /**
@@ -897,2 +899,3 @@
   }
+  
 }
diff -u b/modules/block/tests/block_test.module b/modules/block/tests/block_test.module
--- b/modules/block/tests/block_test.module
+++ b/modules/block/tests/block_test.module
@@ -49,10 +49,10 @@
 function block_test_block_view_block_test_test_underscore_alter(&$data, $block) {
-    $data['content'] = 'hook_block_view_MODULE_DELTA_alter';
+  $data['content'] = 'hook_block_view_MODULE_DELTA_alter';
 }
 
 /**
  * Implements hook_block_view_MODULE_DELTA_alter().
  */
 function block_test_block_view_block_test_test_hyphen_alter(&$data, $block) {
-    $data['content'] = 'hook_block_view_MODULE_DELTA_alter';
+  $data['content'] = 'hook_block_view_MODULE_DELTA_alter';
 }