diff --git a/.travis.yml b/.travis.yml
index 3969360..c40e1d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ php:
   - 5.4
 
 script:
+  - phpunit --version
   - phpunit --configuration tests/phpunit.xml
 
 notifications:
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 97%
rename from tests/properties/default_values_test.php
rename to tests/properties/DefaultValuesPropertiesTest.php
index ab803b9..803afcc 100644
--- a/tests/properties/default_values_test.php
+++ b/tests/properties/DefaultValuesPropertiesTest.php
@@ -1,10 +1,11 @@
 <?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 {
+class DefaultValuesPropertiesTest extends TestCase {
 
     /**
      * CSV
diff --git a/tests/properties/worthless_test.php b/tests/properties/PublicPropertiesTest.php
similarity index 97%
rename from tests/properties/worthless_test.php
rename to tests/properties/PublicPropertiesTest.php
index c41c8df..fbf85d5 100644
--- a/tests/properties/worthless_test.php
+++ b/tests/properties/PublicPropertiesTest.php
@@ -1,10 +1,11 @@
 <?php
+
 namespace ParseCsv\tests\properties;
 
 use ParseCsv\Csv;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
-class DefaultValuesTest extends TestCase {
+class PublicPropertiesTest extends TestCase {
 
     /**
      * CSV