diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 797e5b4..3de63b4 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -6,7 +6,7 @@ if (!file_exists('vendor/autoload.php')) {
 
 require __DIR__ . '/../vendor/autoload.php';
 
-if (!class_exists('PHPUnit\Framework\TestCase')) {
+if (!class_exists('PHPUnit\Framework\TestCase') && class_exists('PHPUnit_Framework_TestCase')) {
     // we run on an older PHPUnit version without namespaces.
     require_once __DIR__ . '/PHPUnit_Framework_TestCase.inc.php';
 }
diff --git a/tests/properties/default_values_test.php b/tests/properties/DefaultValuesPropertiesTest.php
similarity index 99%
rename from tests/properties/default_values_test.php
rename to tests/properties/DefaultValuesPropertiesTest.php
index ab803b9..3e26f95 100644
--- a/tests/properties/default_values_test.php
+++ b/tests/properties/DefaultValuesPropertiesTest.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace ParseCsv\tests\properties;
 
 use ParseCsv\Csv;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class default_values_properties_Test extends TestCase {
 
diff --git a/tests/properties/worthless_test.php b/tests/properties/PublicPropertiesTest.php
similarity index 98%
rename from tests/properties/worthless_test.php
rename to tests/properties/PublicPropertiesTest.php
index c41c8df..5102472 100644
--- a/tests/properties/worthless_test.php
+++ b/tests/properties/PublicPropertiesTest.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace ParseCsv\tests\properties;
 
 use ParseCsv\Csv;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class DefaultValuesTest extends TestCase {