diff --git a/tests/ZendTest/ServiceManager/ServiceManagerTest.php b/tests/ZendTest/ServiceManager/ServiceManagerTest.php
index 2e002bec267..c4d1638b2c8 100644
--- a/tests/ZendTest/ServiceManager/ServiceManagerTest.php
+++ b/tests/ZendTest/ServiceManager/ServiceManagerTest.php
@@ -899,15 +899,17 @@ public function testDelegatorFromCallback()
         $realService = $this->getMock('stdClass', array(), array(), 'RealService');
         $delegator = $this->getMock('stdClass', array(), array(), 'Delegator');
 
-        $delegator = function($serviceManager, $cName, $rName, $callback) use($delegator) {
+        $delegatorFactoryCallback = function($serviceManager, $cName, $rName, $callback) use ($delegator) {
             $delegator->real = call_user_func($callback);
             return $delegator;
         };
 
-        $this->serviceManager->addDelegator('foo-service', $delegator);
-        $this->serviceManager->setService('foo-service', $realService);
+        $this->serviceManager->setFactory('foo-service', function() use ($realService) { return $realService; } );
+        $this->serviceManager->addDelegator('foo-service', $delegatorFactoryCallback);
 
-        $this->assertSame($delegator, $this->serviceManager->create('foo-service'));
-        $this->assertSame($realService, $delegator->real);
+        $service = $this->serviceManager->create('foo-service');
+
+        $this->assertSame($delegator, $service);
+        $this->assertSame($realService, $service->real);
     }
 }