diff --git a/composer.json b/composer.json
index c7f22c7..0416b58 100644
--- a/composer.json
+++ b/composer.json
@@ -5,15 +5,20 @@
     "keywords": ["WebSockets", "websocket", "RFC6455"],
     "homepage": "http://socketo.me",
     "license": "MIT",
-    "authors": [{
-        "name": "Chris Boden"
-      , "email": "cboden@gmail.com"
-      , "role": "Developer"
-    }],
+    "authors": [
+        {
+            "name": "Chris Boden"
+          , "email": "cboden@gmail.com"
+          , "role": "Developer"
+        },
+        {
+            "name": "Matt Bonneau",
+            "role": "Developer"
+        }
+    ],
     "support": {
-        "forum": "https://groups.google.com/forum/#!forum/ratchet-php"
-      , "issues": "https://github.com/ratchetphp/RFC6455/issues"
-      , "irc": "irc://irc.freenode.org/reactphp"
+        "issues": "https://github.com/ratchetphp/RFC6455/issues",
+        "chat": "https://gitter.im/reactphp/reactphp"
     },
     "autoload": {
         "psr-4": {
@@ -29,10 +34,12 @@
         "react/socket": "^1.3"
     },
     "scripts": {
-        "abtests": "sh tests/ab/run_ab_tests.sh",
+        "abtest-client": "ABTEST=client && sh tests/ab/run_ab_tests.sh",
+        "abtest-server": "ABTEST=server && sh tests/ab/run_ab_tests.sh",
         "phpunit": "phpunit --colors=always",
         "test": [
-            "@abtests",
+            "@abtest-client",
+            "@abtest-server",
             "@phpunit"
         ]
     }