diff --git a/tests/Elo/FideEloCalculatorTest.php b/tests/Elo/FideEloCalculatorTest.php
index a2cb2a4..6a2810d 100644
--- a/tests/Elo/FideEloCalculatorTest.php
+++ b/tests/Elo/FideEloCalculatorTest.php
@@ -3,8 +3,9 @@
 use Moserware\Skills\Elo\FideEloCalculator;
 use Moserware\Skills\Elo\ProvisionalFideKFactor;
 use Moserware\Skills\PairwiseComparison;
+use Moserware\Skills\Tests\TestCase;
 
-class FideEloCalculatorTest extends PHPUnit_Framework_TestCase
+class FideEloCalculatorTest extends TestCase
 {
     public function testFideProvisionalEloCalculator()
     {
diff --git a/tests/Numerics/BasicMathTest.php b/tests/Numerics/BasicMathTest.php
index 5d95f29..693a6ee 100644
--- a/tests/Numerics/BasicMathTest.php
+++ b/tests/Numerics/BasicMathTest.php
@@ -1,6 +1,8 @@
 <?php namespace Moserware\Skills\Tests\Numerics;
 
-class BasicMathTest extends PHPUnit_Framework_TestCase
+use Moserware\Skills\Tests\TestCase;
+
+class BasicMathTest extends TestCase
 {
     public function testSquare()
     {
diff --git a/tests/Numerics/GaussianDistributionTest.php b/tests/Numerics/GaussianDistributionTest.php
index 6a1e94b..3b37cc5 100644
--- a/tests/Numerics/GaussianDistributionTest.php
+++ b/tests/Numerics/GaussianDistributionTest.php
@@ -1,8 +1,10 @@
 <?php namespace Moserware\Skills\Tests\Numerics;
 
-use \PHPUnit_Framework_TestCase;
- 
-class GaussianDistributionTest extends PHPUnit_Framework_TestCase
+
+use Moserware\Numerics\GaussianDistribution;
+use Moserware\Skills\Tests\TestCase;
+
+class GaussianDistributionTest extends TestCase
 {    
     const ERROR_TOLERANCE = 0.000001;
     
diff --git a/tests/Numerics/MatrixTest.php b/tests/Numerics/MatrixTest.php
index b593d51..413c048 100644
--- a/tests/Numerics/MatrixTest.php
+++ b/tests/Numerics/MatrixTest.php
@@ -1,11 +1,11 @@
-<?php namespace Moserware\Skills\Tests;
+<?php namespace Moserware\Skills\Tests\Numerics;
 
-use \PHPUnit_Framework_TestCase;
 use Moserware\Numerics\Matrix;
 use Moserware\Numerics\IdentityMatrix;
 use Moserware\Numerics\SquareMatrix;
+use Moserware\Skills\Tests\TestCase;
 
-class MatrixTest extends PHPUnit_Framework_TestCase
+class MatrixTest extends TestCase
 {
     public function testTwoByTwoDeterminant()
     {
diff --git a/tests/RankSorterTest.php b/tests/RankSorterTest.php
index cdbb18b..236754f 100644
--- a/tests/RankSorterTest.php
+++ b/tests/RankSorterTest.php
@@ -1,9 +1,8 @@
 <?php namespace Moserware\Skills\Tests;
 
 use Moserware\Skills\RankSorter;
-use \PHPUnit_Framework_TestCase;
- 
-class RankSorterTest extends PHPUnit_Framework_TestCase
+
+class RankSorterTest extends TestCase
 {
     public function testSort()
     {
@@ -20,6 +19,5 @@ class RankSorterTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($team2, $sortedRanks[0]);        
         $this->assertEquals($team3, $sortedRanks[1]);
         $this->assertEquals($team1, $sortedRanks[2]);
-        
     }
 }
\ No newline at end of file
diff --git a/tests/TestCase.php b/tests/TestCase.php
new file mode 100644
index 0000000..ff93132
--- /dev/null
+++ b/tests/TestCase.php
@@ -0,0 +1,4 @@
+<?php namespace Moserware\Skills\Tests;
+
+class TestCase extends \PHPUnit_Framework_TestCase {
+}
\ No newline at end of file
diff --git a/tests/TrueSkill/DrawMarginTest.php b/tests/TrueSkill/DrawMarginTest.php
index f155a6f..bd14a58 100644
--- a/tests/TrueSkill/DrawMarginTest.php
+++ b/tests/TrueSkill/DrawMarginTest.php
@@ -1,8 +1,9 @@
 <?php namespace Moserware\Skills\Tests\TrueSkill;
 
-use \PHPUnit_Framework_TestCase;
- 
-class DrawMarginTest extends PHPUnit_Framework_TestCase
+use Moserware\Skills\Tests\TestCase;
+use Moserware\Skills\TrueSkill\DrawMargin;
+
+class DrawMarginTest extends TestCase
 {    
     const ERROR_TOLERANCE = 0.000001;
     
diff --git a/tests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php b/tests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
index ff99fec..6c3bbf9 100644
--- a/tests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
+++ b/tests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
@@ -1,9 +1,9 @@
 <?php namespace Moserware\Skills\Tests\TrueSkill;
 
-use \PHPUnit_Framework_TestCase;
+use Moserware\Skills\Tests\TestCase;
 use Moserware\Skills\TrueSkill\FactorGraphTrueSkillCalculator;
 
-class FactorGraphTrueSkillCalculatorTest extends PHPUnit_Framework_TestCase
+class FactorGraphTrueSkillCalculatorTest extends TestCase
 {
     public function testFactorGraphTrueSkillCalculator()
     {     
diff --git a/tests/TrueSkill/TrueSkillCalculatorTests.php b/tests/TrueSkill/TrueSkillCalculatorTests.php
index dc4f218..802505e 100644
--- a/tests/TrueSkill/TrueSkillCalculatorTests.php
+++ b/tests/TrueSkill/TrueSkillCalculatorTests.php
@@ -994,6 +994,4 @@ class TrueSkillCalculatorTests
     {
         $testClass->assertEquals($expectedMatchQuality, $actualMatchQuality, '', self::ERROR_TOLERANCE_MATCH_QUALITY);
     }
-}
-
-?>
+}
\ No newline at end of file
diff --git a/tests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php b/tests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php
index 44bc90a..ee149de 100644
--- a/tests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php
+++ b/tests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php
@@ -1,9 +1,9 @@
 <?php namespace Moserware\Skills\Tests\TrueSkill;
 
-use \PHPUnit_Framework_TestCase;
+use Moserware\Skills\Tests\TestCase;
 use Moserware\Skills\TrueSkill\TwoPlayerTrueSkillCalculator;
 
-class TwoPlayerTrueSkillCalculatorTest extends PHPUnit_Framework_TestCase
+class TwoPlayerTrueSkillCalculatorTest extends TestCase
 {
     public function testTwoPlayerTrueSkillCalculator()
     {
diff --git a/tests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php b/tests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php
index b026d08..7ed1b78 100644
--- a/tests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php
+++ b/tests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php
@@ -1,9 +1,9 @@
 <?php namespace Moserware\Skills\Tests\TrueSkill;
 
-use \PHPUnit_Framework_TestCase;
+use Moserware\Skills\Tests\TestCase;
 use Moserware\Skills\TrueSkill\TwoTeamTrueSkillCalculator;
 
-class TwoTeamTrueSkillCalculatorTest extends PHPUnit_Framework_TestCase
+class TwoTeamTrueSkillCalculatorTest extends TestCase
 {
     public function testTwoTeamTrueSkillCalculator()
     {