diff --git a/.travis.yml b/.travis.yml
index 62ff03b551..9400884bba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -175,6 +175,7 @@ before_script:
       php -r "echo INTL_ICU_DATA_VERSION . \"\n\";"
       psql --version
       mysql --version
+      sudo mysql_upgrade
     fi
   - |
     if [ $TASK_TESTS_JS == 1 ]; then
diff --git a/composer.json b/composer.json
index fb8d091772..83de878388 100644
--- a/composer.json
+++ b/composer.json
@@ -83,7 +83,8 @@
     "require-dev": {
         "phpunit/phpunit": "4.8.34",
         "cebe/indent": "~1.0.2",
-        "friendsofphp/php-cs-fixer": "~2.2.3"
+        "friendsofphp/php-cs-fixer": "~2.2.3",
+        "johnkary/phpunit-speedtrap": "^1.0"
     },
     "repositories": [
         {
diff --git a/composer.lock b/composer.lock
index ccd7209dfa..631f0e86a0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c5363e83fd40667959bed938186dbdf2",
+    "content-hash": "20618e7e02e835f9f1ee41b339f2b61a",
     "packages": [
         {
             "name": "bower-asset/inputmask",
@@ -52,35 +52,23 @@
             "version": "v1.3.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/bestiejs/punycode.js.git",
+                "url": "git@github.com:bestiejs/punycode.js.git",
                 "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3",
                 "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3",
-                "shasum": ""
+                "shasum": null
             },
-            "type": "bower-asset-library",
-            "extra": {
-                "bower-asset-main": "punycode.js",
-                "bower-asset-ignore": [
-                    "coverage",
-                    "tests",
-                    ".*",
-                    "component.json",
-                    "Gruntfile.js",
-                    "node_modules",
-                    "package.json"
-                ]
-            }
+            "type": "bower-asset"
         },
         {
             "name": "bower-asset/yii2-pjax",
             "version": "2.0.7.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/yiisoft/jquery-pjax.git",
+                "url": "git@github.com:yiisoft/jquery-pjax.git",
                 "reference": "aef7b953107264f00234902a3880eb50dafc48be"
             },
             "dist": {
@@ -698,6 +686,56 @@
             ],
             "time": "2014-11-20T16:49:30+00:00"
         },
+        {
+            "name": "johnkary/phpunit-speedtrap",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/johnkary/phpunit-speedtrap.git",
+                "reference": "76a26f8a903a9434608cdad2b41c40cd134ea326"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/76a26f8a903a9434608cdad2b41c40cd134ea326",
+                "reference": "76a26f8a903a9434608cdad2b41c40cd134ea326",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*|~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JohnKary": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Kary",
+                    "email": "john@johnkary.net"
+                }
+            ],
+            "description": "Find slow tests in your PHPUnit test suite",
+            "homepage": "https://github.com/johnkary/phpunit-speedtrap",
+            "keywords": [
+                "phpunit",
+                "profile",
+                "slow"
+            ],
+            "time": "2015-09-13T19:01:00+00:00"
+        },
         {
             "name": "paragonie/random_compat",
             "version": "v2.0.11",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 16c799e05a..179666277f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -32,4 +32,7 @@
 				<directory suffix=".php">framework/bootstrap</directory>
 			</blacklist>
 		</filter>
+        <listeners>
+            <listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener" />
+        </listeners>
 </phpunit>