diff --git a/.coveralls.yml b/.coveralls.yml
deleted file mode 100644
index 7b7d1beb5..000000000
--- a/.coveralls.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-src_dir: .
-coverage_clover: build/logs/clover.xml
-json_path: build/logs/coveralls-upload.json
diff --git a/.travis.yml b/.travis.yml
index 00fd54987..0bcf775f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ before_script:
 
 script:
   - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
-  - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -v; fi"
   - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
   - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=vendor --ignore=docs . ; fi"
 
diff --git a/tests/TestCase/Listener/SearchListenerTest.php b/tests/TestCase/Listener/SearchListenerTest.php
index dd3f996b4..ae073cd2f 100644
--- a/tests/TestCase/Listener/SearchListenerTest.php
+++ b/tests/TestCase/Listener/SearchListenerTest.php
@@ -70,15 +70,24 @@ public function testInjectSearch()
         $eventManager = new \Cake\Event\EventManager();
         $controller = new \Cake\Controller\Controller($request, $response, 'Search', $eventManager);
 
+        $behaviorRegistryMock = $this->getMockBuilder('\Cake\ORM\BehaviorRegistry')
+            ->setMockClassName('BehaviorRegistry')
+            ->setMethods(['hasMethod'])
+            ->getMock();
+        $behaviorRegistryMock->expects($this->once())
+            ->method('hasMethod')
+            ->will($this->returnValue(true));
+
         $tableMock = $this->getMockBuilder('\Cake\ORM\Table')
             ->setMockClassName('SearchTables')
-            ->setMethods(['filterParams'])
+            ->setMethods(['filterParams', 'behaviors'])
             ->getMock();
         $tableMock->expects($this->once())
             ->method('filterParams')
-            ->will($this->returnCallback(function () use ($params) {
-                return $params;
-            }));
+            ->will($this->returnValue($params));
+        $tableMock->expects($this->once())
+            ->method('behaviors')
+            ->will($this->returnValue($behaviorRegistryMock));
 
         \Cake\ORM\TableRegistry::set('Search', $tableMock);