diff --git a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
index 01f1ff7d4..3d4cae1dc 100644
--- a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
+++ b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
@@ -234,6 +234,10 @@ class CakeEventManagerTest extends CakeTestCase {
  * @return void
  */
 	public function testDispatchReturnValue() {
+		$this->skipIf(
+			version_compare(PHPUnit_Runner_Version::VERSION, '3.7', '<'),
+			'These tests fail in PHPUnit 3.6'
+		);
 		$manager = new CakeEventManager;
 		$listener = $this->getMock('CakeEventTestListener');
 		$anotherListener = $this->getMock('CakeEventTestListener');
@@ -241,11 +245,12 @@ class CakeEventManagerTest extends CakeTestCase {
 		$manager->attach(array($anotherListener, 'listenerFunction'), 'fake.event');
 		$event = new CakeEvent('fake.event');
 
-		$firstStep = clone $event;
 		$listener->expects($this->at(0))->method('listenerFunction')
-			->with($firstStep)
+			->with($event)
 			->will($this->returnValue('something special'));
-		$anotherListener->expects($this->at(0))->method('listenerFunction')->with($event);
+		$anotherListener->expects($this->at(0))
+			->method('listenerFunction')
+			->with($event);
 		$manager->dispatch($event);
 		$this->assertEquals('something special', $event->result);
 	}
@@ -256,6 +261,11 @@ class CakeEventManagerTest extends CakeTestCase {
  * @return void
  */
 	public function testDispatchFalseStopsEvent() {
+		$this->skipIf(
+			version_compare(PHPUnit_Runner_Version::VERSION, '3.7', '<'),
+			'These tests fail in PHPUnit 3.6'
+		);
+
 		$manager = new CakeEventManager;
 		$listener = $this->getMock('CakeEventTestListener');
 		$anotherListener = $this->getMock('CakeEventTestListener');
@@ -263,11 +273,11 @@ class CakeEventManagerTest extends CakeTestCase {
 		$manager->attach(array($anotherListener, 'listenerFunction'), 'fake.event');
 		$event = new CakeEvent('fake.event');
 
-		$originalEvent = clone $event;
 		$listener->expects($this->at(0))->method('listenerFunction')
-			->with($originalEvent)
+			->with($event)
 			->will($this->returnValue(false));
-		$anotherListener->expects($this->never())->method('listenerFunction');
+		$anotherListener->expects($this->never())
+			->method('listenerFunction');
 		$manager->dispatch($event);
 		$this->assertTrue($event->isStopped());
 	}