diff --git a/test/TestPWAdboxesClient.php b/test/PWAdboxesClientTest.php
similarity index 98%
rename from test/TestPWAdboxesClient.php
rename to test/PWAdboxesClientTest.php
index 0bbeebd..26bb54d 100644
--- a/test/TestPWAdboxesClient.php
+++ b/test/PWAdboxesClientTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once('../classes/PWAdboxesClient.php');
+require_once(dirname(__FILE__) . '/../classes/PWAdboxesClient.php');
 
-class TestPWAdboxesClient extends PHPUnit_Framework_TestCase {
+class PWAdboxesClientTest extends PHPUnit_Framework_TestCase {
   private $database_client;
   private $sample_ad;
 
diff --git a/test/TestPublisherInfo.php b/test/PublisherInfoTest.php
similarity index 97%
rename from test/TestPublisherInfo.php
rename to test/PublisherInfoTest.php
index a41c657..d937c5e 100644
--- a/test/TestPublisherInfo.php
+++ b/test/PublisherInfoTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once('../classes/PublisherInfo.php');
+require_once(dirname(__FILE__) . '/../classes/PublisherInfo.php');
 
-class TestPublisherInfo extends PHPUnit_Framework_TestCase {
+class PublisherInfoTest extends PHPUnit_Framework_TestCase {
   private $parser, $default_data, $default_data_as_hash;
 
   public function setup() {
diff --git a/test/TestSuitePluginWonderful.php b/test/TestSuitePluginWonderful.php
deleted file mode 100644
index a88e133..0000000
--- a/test/TestSuitePluginWonderful.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-require_once('TestPWAdboxesClient.php');
-require_once('TestPublisherInfo.php');
-
-class TestPluginWonderful {
-  public static function suite() {
-    $suite = new PHPUnit_Framework_TestSuite();
-    $suite->addTestSuite(new ReflectionClass("TestPWAdboxesClient"));
-    $suite->addTestSuite(new ReflectionClass("TestPublisherInfo"));
-    return $suite;
-  }
-}
-
-?>
\ No newline at end of file