diff --git a/.gitattributes b/.gitattributes
index 7a08018..9b72a62 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,4 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
-phpunit.xml export-ignore
-phpunit.reports.xml export-ignore
 test export-ignore
diff --git a/.travis.yml b/.travis.yml
index 815f19c..35d8114 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 before_script:
     - composer install --dev
-script: phpunit
+script: ./vendor/bin/phpunit
 php:
     - 5.3.3
     - 5.3
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 501b740..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright © 2012 James Harris
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/composer.json b/composer.json
index b4a1f2e..e134245 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phake/phake": "1.*"
+        "icecave/testing": "1.*"
     },
     "autoload": {
         "psr-0": {
diff --git a/composer.lock b/composer.lock
index 20cb58d..40c522e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,9 +1,58 @@
 {
-    "hash": "090aca3afd5a6381b71ca3e675f16520",
+    "hash": "5dade6ae58050e6e1caa24a59b8faa70",
     "packages": [
 
     ],
     "packages-dev": [
+        {
+            "name": "icecave/testing",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/IcecaveStudios/testing.git",
+                "reference": "1.0.4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/IcecaveStudios/testing/archive/1.0.4.zip",
+                "reference": "1.0.4",
+                "shasum": ""
+            },
+            "require": {
+                "phake/phake": "1.*"
+            },
+            "suggest": {
+                "eloquent/asplode": "Use the asplode error handler instead of PHPUnit's internal error handler.",
+                "eloquent/liberator": "Use liberator for circumventing PHP access modifier restrictions inside tests."
+            },
+            "time": "2013-01-14 04:12:59",
+            "bin": [
+                "bin/phpunit",
+                "bin/phpunit-coverage",
+                "bin/update-dotfiles"
+            ],
+            "type": "library",
+            "notification-url": "http://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "James Harris",
+                    "email": "james.harris@icecave.com.au"
+                }
+            ],
+            "description": "Helper package for testing Icecave projects in a uniform way.",
+            "homepage": "https://github.com/IcecaveStudios/testing",
+            "keywords": [
+                "testing",
+                "phpunit",
+                "test",
+                "unit",
+                "phake",
+                "coverage"
+            ]
+        },
         {
             "name": "phake/phake",
             "version": "v1.0.3",
@@ -21,14 +70,14 @@
             "require": {
                 "php": ">=5.2.0"
             },
-            "time": "2012-05-14 15:06:51",
+            "time": "2012-05-14 08:06:51",
             "type": "library",
-            "installation-source": "dist",
             "autoload": {
                 "classmap": [
                     "src"
                 ]
             },
+            "notification-url": "http://packagist.org/downloads/",
             "include-path": [
                 "src"
             ],
@@ -38,9 +87,7 @@
             "authors": [
                 {
                     "name": "Mike Lively",
-                    "email": "m@digitalsandwich.com",
-                    "homepage": null,
-                    "role": null
+                    "email": "m@digitalsandwich.com"
                 }
             ],
             "description": "The Phake mock testing library",
diff --git a/phpunit.reports.xml b/phpunit.reports.xml
deleted file mode 100644
index 283a6f7..0000000
--- a/phpunit.reports.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    bootstrap="test/bootstrap.php"
-    strict="true"
-    mapTestClassNameToCoveredClassName="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    verbose="true"
-    colors="true"
->
-    <testsuites>
-        <testsuite>
-            <directory>test/suite</directory>
-        </testsuite>
-    </testsuites>
-
-    <logging>
-        <log
-            type="coverage-clover"
-            target="test/report/coverage.xml"
-        />
-
-        <log
-            type="coverage-html"
-            target="test/report/coverage"
-            charset="UTF-8"
-            yui="true"
-            highlight="true"
-        />
-
-        <log
-            type="json"
-            target="test/report/logfile.json"
-        />
-
-        <log
-            type="tap"
-            target="test/report/logfile.tap"
-        />
-
-        <log
-            type="junit"
-            target="test/report/logfile.xml"
-            logIncompleteSkipped="false"
-        />
-
-        <log
-            type="testdox-html"
-            target="test/report/testdox.html"
-        />
-
-        <log
-            type="testdox-text"
-            target="test/report/testdox.txt"
-        />
-    </logging>
-
-    <filter>
-        <whitelist>
-            <directory>lib</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index fad229c..0000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    bootstrap="test/bootstrap.php"
-    strict="true"
-    mapTestClassNameToCoveredClassName="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    verbose="true"
-    colors="true"
->
-    <testsuites>
-        <testsuite>
-            <directory>test/suite</directory>
-        </testsuite>
-    </testsuites>
-</phpunit>
diff --git a/test/bootstrap.php b/test/bootstrap.php
deleted file mode 100644
index b22a138..0000000
--- a/test/bootstrap.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$autoloader = require __DIR__ . '/../vendor/autoload.php';
-$autoloader->add('Icecave\Isolator\TestFixture', __DIR__.'/lib');
-
-Phake::setClient(Phake::CLIENT_PHPUNIT);