diff --git a/tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php b/tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php
index e922b51..977ae58 100644
--- a/tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php
+++ b/tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php
@@ -86,6 +86,6 @@ class ListenerPatternTest extends \PHPUnit_Framework_TestCase
 
     private function getMockEventDispatcher()
     {
-        return $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        return $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
     }
 }
diff --git a/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php b/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php
index af18b1a..54b26c1 100644
--- a/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php
+++ b/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php
@@ -127,7 +127,7 @@ class WildcardEventDispatcherFunctionalTest extends \PHPUnit_Framework_TestCase
     private function assertNumberListenersAdded($expected, $eventName = null)
     {
         return isset($eventName)
-            ? $this->assertEquals($expected, count($this->dispatcher->getListeners($eventName)))
+            ? $this->assertCount($expected, $this->dispatcher->getListeners($eventName))
             : $this->assertEquals($expected, array_sum(array_map('count', $this->dispatcher->getListeners())));
     }
 }
diff --git a/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php b/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php
index 5ae60f0..c8076e6 100644
--- a/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php
+++ b/tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php
@@ -148,7 +148,7 @@ class EventDispatcherTest extends \PHPUnit_Framework_TestCase
 
     private function getMockEventDispatcher()
     {
-        return $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        return $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
     }
 }