diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a61160cd..a35b7362 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/tests/Omnipay/Common/CreditCardTest.php b/tests/Omnipay/Common/CreditCardTest.php
index 936541e9..78c69dc1 100644
--- a/tests/Omnipay/Common/CreditCardTest.php
+++ b/tests/Omnipay/Common/CreditCardTest.php
@@ -50,6 +50,9 @@ public function testGetParamters()
         $this->assertSame(2016, $parameters['expiryYear']);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testValidateFixture()
     {
         $this->card->validate();
diff --git a/tests/Omnipay/Common/HelperTest.php b/tests/Omnipay/Common/HelperTest.php
index 1d47f56c..0c11ecca 100644
--- a/tests/Omnipay/Common/HelperTest.php
+++ b/tests/Omnipay/Common/HelperTest.php
@@ -43,12 +43,18 @@ public function testValidateLuhnNull()
         $this->assertTrue($result);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testInitializeIgnoresNull()
     {
         $target = m::mock();
         Helper::initialize($target, null);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testInitializeCallsSetters()
     {
         $target = m::mock('\Omnipay\Common\CreditCard');
@@ -58,6 +64,9 @@ public function testInitializeCallsSetters()
         Helper::initialize($target, array('name' => 'adrian', 'number' => '1234'));
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testInitializeIgnoresInvalidParameters()
     {
         $target = m::mock('\Omnipay\Common\CreditCard');
diff --git a/tests/Omnipay/OmnipayTest.php b/tests/Omnipay/OmnipayTest.php
index 2ad08124..eb0751d5 100644
--- a/tests/Omnipay/OmnipayTest.php
+++ b/tests/Omnipay/OmnipayTest.php
@@ -10,6 +10,8 @@ class OmnipayTest extends TestCase
     public function tearDown()
     {
         Omnipay::setFactory(null);
+
+        parent::tearDown();
     }
 
     public function testGetFactory()
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 847298ef..00000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-error_reporting(E_ALL | E_STRICT);
-date_default_timezone_set('UTC');
-
-// include the composer autoloader
-$autoloader = require __DIR__.'/../vendor/autoload.php';
-
-// autoload abstract TestCase classes in test directory
-$autoloader->add('Omnipay', __DIR__);