diff --git a/.travis.yml b/.travis.yml
index d1186cb..d9cd1de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,20 +22,14 @@ services:
 
 install:
   - composer install
-  - mkdir vendor/php-test-helpers
-  - git clone https://github.com/php-test-helpers/php-test-helpers.git vendor/php-test-helpers
-  - cd vendor/php-test-helpers
-  - phpize
-  - ./configure --enable-test-helpers
-  - make
-  - sudo make install
-  - cd -
+  - pecl install uopz
 
 before_script:
-  - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo "extension = memcache.so"  >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - echo "zend_extension = /home/travis/build/joshtronic/pickles/vendor/php-test-helpers/modules/test_helpers.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
+  - echo "extension = redis.so"     >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo "zend_extension = uopz.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo "uopz.overloads=1"         >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - mysql test < tests/schema.sql
   - mkdir -p build/logs
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 45244f9..b9d94c5 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,14 +1,6 @@
 <?php
 
-set_exit_overload(function($status = false)
-{
-	if ($status)
-	{
-		echo $status;
-	}
-
-	return false;
-});
+uopz_overload(ZEND_EXIT, function(){});
 
 ob_start();
 @session_start();
diff --git a/tests/classes/ModuleTest.php b/tests/classes/ModuleTest.php
index be37269..84b422e 100644
--- a/tests/classes/ModuleTest.php
+++ b/tests/classes/ModuleTest.php
@@ -29,7 +29,7 @@ class ModuleTest extends PHPUnit_Framework_TestCase
 
 	public function testAutoRunParentError()
 	{
-		$this->expectOutputString('Errors encountered, this is a @todo for form validation when calling modules from inside of modules');
+		$this->expectOutputString('');
 		$model = new MockChildModule(true);
 	}