diff --git a/.travis.yml b/.travis.yml
index 54d85398a535695a49657e2cfe7a4f5fd3842f1c..1f81f3ee7df3619e398ef9ff692a7c9599b9f1ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,22 @@
-sudo: true
+sudo: false
 language: php
 php:
-  - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
 env:
   global:
-    - JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
-    - ELASRICSEARCH_HOST="127.0.0.1:9200"
-    - ES_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.1.2.zip"
-matrix:
-  allow_failures:
-    - php: hhvm
+    - ES_VERSION=6.2.2 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
 install:
-  # Container based PHP image ues PHP 5.6.5, once it will be upgraded sudo will be not necessary
-  - sudo apt-get install -y oracle-java8-set-default
-  - curl -L -o elasticsearch.zip $ES_URL
-  - unzip elasticsearch.zip
-  - ./elasticsearch-*/bin/elasticsearch -d -Escript.inline=true -Escript.stored=true
+  - wget ${ES_DOWNLOAD_URL}
+  - tar -xzf elasticsearch-${ES_VERSION}.tar.gz
+  - ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d
 before_script:
   - composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH
   - composer install --no-interaction --prefer-dist
 script:
+  - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200
   - vendor/bin/phpunit --coverage-clover=coverage.clover
   - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/ ./
 after_script:
-  - travis_retry php vendor/bin/coveralls
+  - travis_retry php vendor/bin/coveralls
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c9db5e9594461366223b55894b99ffd501f93322..5a33e2aba9ec37a5743000d05bec4882dd1e1364 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     "require-dev": {
         "phpunit/phpunit": "~6.0",
         "squizlabs/php_codesniffer": "~3.0",
-        "satooshi/php-coveralls": "~1.0"
+        "satooshi/php-coveralls": "~2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Aggregation/Matrix/MatrixStatsAggregation.php b/src/Aggregation/Matrix/MatrixStatsAggregation.php
index 7e8d96cef448e890b40e7b146a87cef38638838e..5fb916d855a78952f4332f49899a9a7492241971 100644
--- a/src/Aggregation/Matrix/MatrixStatsAggregation.php
+++ b/src/Aggregation/Matrix/MatrixStatsAggregation.php
@@ -10,6 +10,7 @@
  */
 
 namespace ONGR\ElasticsearchDSL\Aggregation\Matrix;
+
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
 
@@ -96,12 +97,12 @@ class MaxAggregation extends AbstractAggregation
             $out['fields'] = $this->getField();
         }
 
-        if($this->getMode()) {
+        if ($this->getMode()) {
             $out['mode'] = $this->getMode();
         }
 
 
-        if($this->getMissing()) {
+        if ($this->getMissing()) {
             $out['missing'] = $this->getMissing();
         }
 
diff --git a/tests/Functional/AbstractElasticsearchTestCase.php b/tests/Functional/AbstractElasticsearchTestCase.php
index 2b5ecfc9613dbd1b0dbb3051cbcfd9ad77d66f0b..f1387ad2c730d16ad10de772b5512adeca97527a 100644
--- a/tests/Functional/AbstractElasticsearchTestCase.php
+++ b/tests/Functional/AbstractElasticsearchTestCase.php
@@ -15,7 +15,7 @@ use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
 use ONGR\ElasticsearchDSL\Search;
 
-abstract class AbstractElasticsearchTestCase extends \PHPUnit_Framework_TestCase
+abstract class AbstractElasticsearchTestCase extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test index name in the elasticsearch.
diff --git a/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php b/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php
index 3e00acaef8f6596b0e8b8d6d6288cccb3d996088..f4cb6b3a4ab53c2e7c0a98128f25aed0972c28d5 100644
--- a/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/ChildrenAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\ChildrenAggregation;
 /**
  * Unit test for children aggregation.
  */
-class ChildrenAggregationTest extends \PHPUnit_Framework_TestCase
+class ChildrenAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if ChildrenAggregation#getArray throws exception when expected.
diff --git a/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php
index da340c6d89baade4a4731702c12a5feb1524f507..6f7544bbbde86e50b4ca582a4b7778d1f9572184 100644
--- a/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/DateHistogramAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateHistogramAggregation;
 /**
  * Unit test for children aggregation.
  */
-class DateHistogramAggregationTest extends \PHPUnit_Framework_TestCase
+class DateHistogramAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if ChildrenAggregation#getArray throws exception when expected.
diff --git a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
index 8fc3bbbe3d4f11807385c7f1a1e4a0775db9677d..80514f2f9ed83b2e4e0c471792dde152f9a08b1e 100644
--- a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateRangeAggregation;
 
-class DateRangeAggregationTest extends \PHPUnit_Framework_TestCase
+class DateRangeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
@@ -121,7 +121,7 @@ class DateRangeAggregationTest extends \PHPUnit_Framework_TestCase
             ->getMock();
         $aggregation->expects($this->once())->method('setField')->with($field);
         $aggregation->expects($this->once())->method('setFormat')->with($format);
-        $aggregation->expects($this->exactly(count($ranges)))->method('addRange');
+        $aggregation->expects($this->exactly(count($ranges ?? [])))->method('addRange');
 
         if ($field !== null) {
             if ($format !== null) {
diff --git a/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php
index 7b79c21dd904e97afbacef6c6f05b567bfc618b1..b453e014e3f36f88e732166ba7d7ef83f1d8512e 100644
--- a/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/FilterAggregationTest.php
@@ -18,7 +18,7 @@ use ONGR\ElasticsearchDSL\Query\TermLevel\ExistsQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 
-class FilterAggregationTest extends \PHPUnit_Framework_TestCase
+class FilterAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray.
diff --git a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php
index f5b4369daf75ffa06ea03c0e24371e2c374fb3a3..b3032a31669cdec169a2726bcbc63f80ea9fb634 100644
--- a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\BuilderInterface;
 /**
  * Unit test for filters aggregation.
  */
-class FiltersAggregationTest extends \PHPUnit_Framework_TestCase
+class FiltersAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when not anonymous filter is without name.
diff --git a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php
index c19b1f1318c8fe7c117c26f66c3505d211d480d5..89f2f5d5841111975b90eb1fb85dc864b13feaa6 100644
--- a/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/GeoDistanceAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GeoDistanceAggregation;
 
-class GeoDistanceAggregationTest extends \PHPUnit_Framework_TestCase
+class GeoDistanceAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not set.
diff --git a/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php
index 627a4f316262ac61284350fc4edd4bd28825019b..1ef28d345e53558cef7ac093710275a776ddf24a 100644
--- a/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/GeoHashGridAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GeoHashGridAggregation;
 /**
  * Unit test for geohash grid aggregation.
  */
-class GeoHashGridAggregationTest extends \PHPUnit_Framework_TestCase
+class GeoHashGridAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
diff --git a/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php b/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php
index 03f5ca9092e70c926a18eacfc82f0c39139b354c..725ed283991ba3e6fb6628cc995dc8a684d297b0 100644
--- a/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/GlobalAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\GlobalAggregation;
 
-class GlobalAggregationTest extends \PHPUnit_Framework_TestCase
+class GlobalAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray().
diff --git a/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php
index f6b60db4145f594346ec72b7276e3e7b08bc4252..7566efe8d20955e01cd3c2d92085cd384a750dc1 100644
--- a/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/Ipv4RangeAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\Ipv4RangeAggregation;
 
-class Ipv4RangeAggregationTest extends \PHPUnit_Framework_TestCase
+class Ipv4RangeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test exception when field and range are not set.
diff --git a/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php b/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php
index 11f6b4ab09fa926da5f70b307896d7fdefd315e4..613d97ba08cfe079abba4b23eaa17f61161ddea5 100644
--- a/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/MissingAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\MissingAggregation;
 
-class MissingAggregationTest extends \PHPUnit_Framework_TestCase
+class MissingAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not set.
diff --git a/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php b/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php
index 51886af59cfa2d8fe8d3849dc37274889bb6d7fb..b4458f12442cd0ddceb4617b46041f2d8c66cc21 100644
--- a/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/NestedAggregationTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\NestedAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 
-class NestedAggregationTest extends \PHPUnit_Framework_TestCase
+class NestedAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for nested aggregation toArray() method exception.
diff --git a/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
index 741a0be9cdb33841019ee29860dc6253f6ff1aa0..55134a86bb418147858a8ef4cc34ca85b2671edf 100644
--- a/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\RangeAggregation;
 
-class RangeAggregationTest extends \PHPUnit_Framework_TestCase
+class RangeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test addRange method.
diff --git a/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php b/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php
index e14a055f83ed6e6bc9a90da37207cf4a9c5894dd..11ed18f70b16efd491316cff46bfbd95e43245a8 100644
--- a/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/ReverseNestedAggregationTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\ReverseNestedAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 
-class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
+class ReverseNestedAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for reverse_nested aggregation toArray() method exception.
diff --git a/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php b/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php
index 09a945561bd9992e4cf9dd91ae64bd6c7847f2fb..0bbb209bf8053653b50297b7de5d1df6d491dbb3 100644
--- a/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/SamplerAggregationTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 /**
  * Unit test for children aggregation.
  */
-class SamplerAggregationTest extends \PHPUnit_Framework_TestCase
+class SamplerAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getType method.
diff --git a/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php b/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php
index 98da346fcfbece632ae47dd778324cb72aaf3114..c6cf213375b30a33dfe24e2571e6e67867fb6d25 100644
--- a/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/SignificantTermsAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Bucketing\SignificantTermsAggregation;
 /**
  * Unit test for children aggregation.
  */
-class SignificantTermsAggregationTest extends \PHPUnit_Framework_TestCase
+class SignificantTermsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getType method.
diff --git a/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php b/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php
index ea9c826799d31a82ff7431fb83b0d59e284892a3..47924419963bb1aa9960596833488e9037ee1aa3 100644
--- a/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/TermsAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Bucketing\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\TermsAggregation;
 
-class TermsAggregationTest extends \PHPUnit_Framework_TestCase
+class TermsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests setField method.
diff --git a/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php b/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php
index 14cf1b0863da9b56a3ecf99003864b5e38916318..8ec9f2cf172461bd91ce240076b43b94529cafc1 100644
--- a/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/CardinalityAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Metric\CardinalityAggregation;
 /**
  * Unit test for cardinality aggregation.
  */
-class CardinalityAggregationTest extends \PHPUnit_Framework_TestCase
+class CardinalityAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getArray method.
diff --git a/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php b/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php
index 02984bf4dd047c108d2e9770037c0edecb9fc3bf..efccb9ba240a8f2af6d7790e92adc0500a096355 100644
--- a/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/GeoBoundsAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Metric\GeoBoundsAggregation;
 /**
  * Unit test for geo bounds aggregation.
  */
-class GeoBoundsAggregationTest extends \PHPUnit_Framework_TestCase
+class GeoBoundsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown.
diff --git a/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php b/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php
index 4f263e547ac0d2e5f9cdb5716b13758677b6ee11..dca14573d4f80da6e675eb8c13837270a235fa40 100644
--- a/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/GeoCentroidAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Metric\GeoCentroidAggregation;
 /**
  * Unit test for children aggregation.
  */
-class GeoCentroidAggregationTest extends \PHPUnit_Framework_TestCase
+class GeoCentroidAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when field is not provided
diff --git a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php
index dd3ae46b2eaa0ae1e0632ae3cb9f8aaaba5fb36f..12aeffcc910ee4547371bdd83d1f78c81b170b2e 100644
--- a/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/PercentileRanksAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Metric\PercentileRanksAggregation;
 /**
  * Percentile ranks aggregation unit tests.
  */
-class PercentileRanksAggregationTest extends \PHPUnit_Framework_TestCase
+class PercentileRanksAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var PercentileRanksAggregation
diff --git a/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php b/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php
index b7cbec25aace6d2ae1b0f0271f310926b3a864de..aa98aa3ed623a99577e3f0a76f9d20fc96f1672b 100644
--- a/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/PercentilesAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Metric\PercentilesAggregation;
 
-class PercentilesAggregationTest extends \PHPUnit_Framework_TestCase
+class PercentilesAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if PercentilesAggregation#getArray throws exception when expected.
diff --git a/tests/Unit/Aggregation/Metric/StatsAggregationTest.php b/tests/Unit/Aggregation/Metric/StatsAggregationTest.php
index 794bb80ccdeeaf9d02690925b91dfea658dbe1ac..e130641ea8288042191e5dca86b9b4c13b65ab12 100644
--- a/tests/Unit/Aggregation/Metric/StatsAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/StatsAggregationTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Metric\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Metric\StatsAggregation;
 
-class StatsAggregationTest extends \PHPUnit_Framework_TestCase
+class StatsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for stats aggregation toArray() method.
diff --git a/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php b/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php
index 53f6294effd83bde01113b423ea375642df097f9..046390a0221e391de66e010fe9d5a1919d96055c 100644
--- a/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php
+++ b/tests/Unit/Aggregation/Metric/TopHitsAggregationTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\Sort\FieldSort;
 /**
  * Unit tests for top hits aggregation.
  */
-class TopHitsAggregationTest extends \PHPUnit_Framework_TestCase
+class TopHitsAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Check if aggregation returns the expected array.
diff --git a/tests/Unit/Aggregation/Pipeline/AvgBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/AvgBucketAggregationTest.php
index e4682245fdc28d80d2767cd4fd7af92d0dd9a667..d4d26af10e1e1d21292dc63d5d6ef63bbe188af5 100644
--- a/tests/Unit/Aggregation/Pipeline/AvgBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/AvgBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\AvgBucketAggregation;
 /**
  * Unit test for avg_bucket aggregation.
  */
-class AvgBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class AvgBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php b/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php
index 8f75353079e421c1e21663a1b0ac3c41168e89d5..16c85b62fbb9e76f36d971b9a0843354fb06b895 100644
--- a/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/BucketScriptAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\BucketScriptAggregation;
 /**
  * Unit test for bucket script pipeline aggregation.
  */
-class BucketScriptAggregationTest extends \PHPUnit_Framework_TestCase
+class BucketScriptAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php b/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php
index d54f61fa85c4146f2463b81ac9ce1e0b452885fb..c8edbc9c5ba7dd9203b8b7f9dda508d6b1d0fac6 100644
--- a/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/BucketSelectorAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\BucketSelectorAggregation;
 /**
  * Unit test for bucket selector pipeline aggregation.
  */
-class BucketSelectorAggregationTest extends \PHPUnit_Framework_TestCase
+class BucketSelectorAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/CumulativeSumAggregationTest.php b/tests/Unit/Aggregation/Pipeline/CumulativeSumAggregationTest.php
index e5cebf8a36ba51631e1d95fdd7c7e73367cc04d3..2a9049497b1f887c7a7c45b00570cedb6022de31 100644
--- a/tests/Unit/Aggregation/Pipeline/CumulativeSumAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/CumulativeSumAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\CumulativeSumAggregation;
 /**
  * Unit test for cumulative sum aggregation.
  */
-class CumulativeSumAggregationTest extends \PHPUnit_Framework_TestCase
+class CumulativeSumAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/DerivativeAggregationTest.php b/tests/Unit/Aggregation/Pipeline/DerivativeAggregationTest.php
index ada4424e65e0575473e443b22cda7d6803a8ee70..2d37b5ace17a2a3c97ede69feb117771da76cdc5 100644
--- a/tests/Unit/Aggregation/Pipeline/DerivativeAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/DerivativeAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\DerivativeAggregation;
 /**
  * Unit test for derivative aggregation.
  */
-class DerivativeAggregationTest extends \PHPUnit_Framework_TestCase
+class DerivativeAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/ExtendedStatsBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/ExtendedStatsBucketAggregationTest.php
index de15f1053ebcf42e65c7dce827ff1eaf3e905283..69f3efc18f102a547650d2f0a1e86842ba0205c3 100644
--- a/tests/Unit/Aggregation/Pipeline/ExtendedStatsBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/ExtendedStatsBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\ExtendedStatsBucketAggregation;
 /**
  * Unit test for stats bucket aggregation.
  */
-class ExtendedStatsBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class ExtendedStatsBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/MaxBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/MaxBucketAggregationTest.php
index a5f9d07db9fe3bcfb1037618f1b3f22370bb00d3..db8af0808f4d71c1ca8a741739dcbab9137ef0d9 100644
--- a/tests/Unit/Aggregation/Pipeline/MaxBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/MaxBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\MaxBucketAggregation;
 /**
  * Unit test for max bucket aggregation.
  */
-class MaxBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class MaxBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/MinBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/MinBucketAggregationTest.php
index c570569bf51e614357e38149c0364556aea66ee6..cee5c0c101c5b41f4427cb7040bb063960e70fb1 100644
--- a/tests/Unit/Aggregation/Pipeline/MinBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/MinBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\MinBucketAggregation;
 /**
  * Unit test for min bucket aggregation.
  */
-class MinBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class MinBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/PercentilesBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/PercentilesBucketAggregationTest.php
index ae94d775cb6334ffe1ff8d1ca1e31cc4ed88df91..21ecc1b203eaf62d331f8f3a319e77aff5790f1b 100644
--- a/tests/Unit/Aggregation/Pipeline/PercentilesBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/PercentilesBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\PercentilesBucketAggregation;
 /**
  * Unit test for percentiles bucket aggregation.
  */
-class PercentilesBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class PercentilesBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/SerialDifferencingAggregationTest.php b/tests/Unit/Aggregation/Pipeline/SerialDifferencingAggregationTest.php
index 77e75e895f62c8c025ba3e28e61690992aad57f9..41c0bac8dc1046673ed4da9b3c1bab15bbf6191b 100644
--- a/tests/Unit/Aggregation/Pipeline/SerialDifferencingAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/SerialDifferencingAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\SerialDifferencingAggregation;
 /**
  * Unit test for serial differencing aggregation.
  */
-class SerialDifferencingAggregationTest extends \PHPUnit_Framework_TestCase
+class SerialDifferencingAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/StatsBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/StatsBucketAggregationTest.php
index 876ee8d5e76f2c86be2639cda17dc66ad2d14ce0..3bf5dd452d2f4610d1cce20bbc6f66ac1dcc583f 100644
--- a/tests/Unit/Aggregation/Pipeline/StatsBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/StatsBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\StatsBucketAggregation;
 /**
  * Unit test for stats bucket aggregation.
  */
-class StatsBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class StatsBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/Aggregation/Pipeline/SumBucketAggregationTest.php b/tests/Unit/Aggregation/Pipeline/SumBucketAggregationTest.php
index 2ee9a4a3b131aa657a3dbd03b820620fa1af46ce..2e117543ca7901734b25872ef726fff5f349b22f 100644
--- a/tests/Unit/Aggregation/Pipeline/SumBucketAggregationTest.php
+++ b/tests/Unit/Aggregation/Pipeline/SumBucketAggregationTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Aggregation\Pipeline\SumBucketAggregation;
 /**
  * Unit test for sum bucket aggregation.
  */
-class SumBucketAggregationTest extends \PHPUnit_Framework_TestCase
+class SumBucketAggregationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray method.
diff --git a/tests/Unit/BuilderBagTest.php b/tests/Unit/BuilderBagTest.php
index 44228a578b03923796a4e59a50ca2770c0ba2695..49d6a2ffd99c8b55c5ce18e556b66e1b923b2fd8 100644
--- a/tests/Unit/BuilderBagTest.php
+++ b/tests/Unit/BuilderBagTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit;
 use ONGR\ElasticsearchDSL\BuilderBag;
 use ONGR\ElasticsearchDSL\BuilderInterface;
 
-class BuilderBagTest extends \PHPUnit_Framework_TestCase
+class BuilderBagTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests if bag knows if he has a builder.
diff --git a/tests/Unit/Highlight/HighlightTest.php b/tests/Unit/Highlight/HighlightTest.php
index ede0f36f8ad7ad80ae7bd527a203002fe1e76795..bc5ddaa1b538af36fc83d40125aa7b862d80f418 100644
--- a/tests/Unit/Highlight/HighlightTest.php
+++ b/tests/Unit/Highlight/HighlightTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Highlight;
 
 use ONGR\ElasticsearchDSL\Highlight\Highlight;
 
-class HighlightTest extends \PHPUnit_Framework_TestCase
+class HighlightTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests GetType method, it should return 'highlight'.
diff --git a/tests/Unit/InnerHit/NestedInnerHitTest.php b/tests/Unit/InnerHit/NestedInnerHitTest.php
index 1fb042cd9ad697a4301e35d9989289555c1c5985..0e1ee2cbb28f00805a9a57ab4b9bdbc42e9fd667 100644
--- a/tests/Unit/InnerHit/NestedInnerHitTest.php
+++ b/tests/Unit/InnerHit/NestedInnerHitTest.php
@@ -7,7 +7,7 @@ use ONGR\ElasticsearchDSL\Query\FullText\MatchQuery;
 use ONGR\ElasticsearchDSL\Query\Joining\NestedQuery;
 use ONGR\ElasticsearchDSL\Search;
 
-class NestedInnerHitTest extends \PHPUnit_Framework_TestCase
+class NestedInnerHitTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray().
diff --git a/tests/Unit/InnerHit/ParentInnerHitTest.php b/tests/Unit/InnerHit/ParentInnerHitTest.php
index 65c18dbd2cbd3c3edcbc76be15e7c433b6e27f62..7794b9b4d38bbe97e58541be24dc4b9a26d346da 100644
--- a/tests/Unit/InnerHit/ParentInnerHitTest.php
+++ b/tests/Unit/InnerHit/ParentInnerHitTest.php
@@ -6,7 +6,7 @@ use ONGR\ElasticsearchDSL\InnerHit\ParentInnerHit;
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use ONGR\ElasticsearchDSL\Search;
 
-class ParentInnerHitTest extends \PHPUnit_Framework_TestCase
+class ParentInnerHitTest extends \PHPUnit\Framework\TestCase
 {
     public function testToArray()
     {
diff --git a/tests/Unit/ParametersTraitTest.php b/tests/Unit/ParametersTraitTest.php
index 8b3e9f68ea70188b41bf74f86223794f3bda3fb7..d456e288274d2598efa658495f77d9e89769ea8f 100644
--- a/tests/Unit/ParametersTraitTest.php
+++ b/tests/Unit/ParametersTraitTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\ParametersTrait;
 /**
  * Test for ParametersTrait.
  */
-class ParametersTraitTest extends \PHPUnit_Framework_TestCase
+class ParametersTraitTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ParametersTrait
diff --git a/tests/Unit/Query/Compound/BoolQueryTest.php b/tests/Unit/Query/Compound/BoolQueryTest.php
index b2e3da14d7cc5213ce0396bc79649ac3bf1c7901..4eb0417dbef94c12101951e3b3a169173b4c89c1 100644
--- a/tests/Unit/Query/Compound/BoolQueryTest.php
+++ b/tests/Unit/Query/Compound/BoolQueryTest.php
@@ -18,7 +18,7 @@ use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 /**
  * Unit test for Bool.
  */
-class BoolQueryTest extends \PHPUnit_Framework_TestCase
+class BoolQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for addToBool() without setting a correct bool operator.
diff --git a/tests/Unit/Query/Compound/BoostingQueryTest.php b/tests/Unit/Query/Compound/BoostingQueryTest.php
index 08549bdc8eb992ab732a694b27547bf4df4a521a..7fa687b65fdc1b0245db8e2198b26dd32a02b164 100644
--- a/tests/Unit/Query/Compound/BoostingQueryTest.php
+++ b/tests/Unit/Query/Compound/BoostingQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 
 use ONGR\ElasticsearchDSL\Query\Compound\BoostingQuery;
 
-class BoostingQueryTest extends \PHPUnit_Framework_TestCase
+class BoostingQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Compound/ConstantScoreQueryTest.php b/tests/Unit/Query/Compound/ConstantScoreQueryTest.php
index e5bb2e21dca61720adcaacf7a09e5cf6ace021d5..c1a11dcc9f7fb9787347127469abc9fcc4c34aa7 100644
--- a/tests/Unit/Query/Compound/ConstantScoreQueryTest.php
+++ b/tests/Unit/Query/Compound/ConstantScoreQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 
 use ONGR\ElasticsearchDSL\Query\Compound\ConstantScoreQuery;
 
-class ConstantScoreQueryTest extends \PHPUnit_Framework_TestCase
+class ConstantScoreQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Compound/DisMaxQueryTest.php b/tests/Unit/Query/Compound/DisMaxQueryTest.php
index 833ad0c50182a7ba08ec650cb02bd476f9f6fba0..cbdda1fe4c5233e86f5aab031b6ff7c32f914d28 100644
--- a/tests/Unit/Query/Compound/DisMaxQueryTest.php
+++ b/tests/Unit/Query/Compound/DisMaxQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 
 use ONGR\ElasticsearchDSL\Query\Compound\DisMaxQuery;
 
-class DisMaxQueryTest extends \PHPUnit_Framework_TestCase
+class DisMaxQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Compound/FunctionScoreQueryTest.php b/tests/Unit/Query/Compound/FunctionScoreQueryTest.php
index 508881ba4d774cec0165d1e2533db26dea000ffb..9997b0b7d045c64bf877a76375e73e3994d725f4 100644
--- a/tests/Unit/Query/Compound/FunctionScoreQueryTest.php
+++ b/tests/Unit/Query/Compound/FunctionScoreQueryTest.php
@@ -19,7 +19,7 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
 /**
  * Tests for FunctionScoreQuery.
  */
-class FunctionScoreQueryTest extends \PHPUnit_Framework_TestCase
+class FunctionScoreQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testAddRandomFunction.
diff --git a/tests/Unit/Query/Compound/IndicesQueryTest.php b/tests/Unit/Query/Compound/IndicesQueryTest.php
index 268d8a4ccf1cc352d5afae10f8f5e00035718205..72f1778071aac9a4d96df69093897f777aa4f9cb 100644
--- a/tests/Unit/Query/Compound/IndicesQueryTest.php
+++ b/tests/Unit/Query/Compound/IndicesQueryTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 use ONGR\ElasticsearchDSL\BuilderInterface;
 use ONGR\ElasticsearchDSL\Query\Compound\IndicesQuery;
 
-class IndicesQueryTest extends \PHPUnit_Framework_TestCase
+class IndicesQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|BuilderInterface
diff --git a/tests/Unit/Query/FullText/CommonTermsQueryTest.php b/tests/Unit/Query/FullText/CommonTermsQueryTest.php
index 4e6e4767c6b29d1e151667f9ccd32a4c835a11c0..8a387132a665e10791c23dfbe4dcfb6631877234 100644
--- a/tests/Unit/Query/FullText/CommonTermsQueryTest.php
+++ b/tests/Unit/Query/FullText/CommonTermsQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\CommonTermsQuery;
 
-class CommonTermsQueryTest extends \PHPUnit_Framework_TestCase
+class CommonTermsQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/MatchPhrasePrefixQueryTest.php b/tests/Unit/Query/FullText/MatchPhrasePrefixQueryTest.php
index 32c6117aae244e9eeef4169b3ac8f63577b85b6e..9a0d651e78befdeb498855a947f4186e58ebad85 100644
--- a/tests/Unit/Query/FullText/MatchPhrasePrefixQueryTest.php
+++ b/tests/Unit/Query/FullText/MatchPhrasePrefixQueryTest.php
@@ -12,9 +12,9 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\MatchPhrasePrefixQuery;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class MatchPhrasePrefixQueryTest extends PHPUnit_Framework_TestCase
+class MatchPhrasePrefixQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/MatchPhraseQueryTest.php b/tests/Unit/Query/FullText/MatchPhraseQueryTest.php
index 6614f0ddfea9ae43bfd1b53ba0aac6606930867f..0bd142c009259f6028db561cca7274b6705d8b97 100644
--- a/tests/Unit/Query/FullText/MatchPhraseQueryTest.php
+++ b/tests/Unit/Query/FullText/MatchPhraseQueryTest.php
@@ -12,9 +12,9 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\MatchPhraseQuery;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class MatchPhraseQueryTest extends PHPUnit_Framework_TestCase
+class MatchPhraseQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/MatchQueryTest.php b/tests/Unit/Query/FullText/MatchQueryTest.php
index e186ca43e30d4a6d8409ca863208162a6bb40607..e1b664f2685962bf1d27dfef0b45d28b11bcc9c9 100644
--- a/tests/Unit/Query/FullText/MatchQueryTest.php
+++ b/tests/Unit/Query/FullText/MatchQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\MatchQuery;
 
-class MatchQueryTest extends \PHPUnit_Framework_TestCase
+class MatchQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/MultiMatchQueryTest.php b/tests/Unit/Query/FullText/MultiMatchQueryTest.php
index 3ee14608009152bba274c479c11ca26a595460b7..a21e68dbb624bcea0c3a541a149dde33c2137e07 100644
--- a/tests/Unit/Query/FullText/MultiMatchQueryTest.php
+++ b/tests/Unit/Query/FullText/MultiMatchQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\MultiMatchQuery;
 
-class MultiMatchQueryTest extends \PHPUnit_Framework_TestCase
+class MultiMatchQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/QueryStringQueryTest.php b/tests/Unit/Query/FullText/QueryStringQueryTest.php
index 1a07a25b8129bfa535955b5f50bef24790549592..7d8337d40db3c2b43695dab9b3bec280eb40eb3a 100644
--- a/tests/Unit/Query/FullText/QueryStringQueryTest.php
+++ b/tests/Unit/Query/FullText/QueryStringQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\QueryStringQuery;
 
-class QueryStringQueryTest extends \PHPUnit_Framework_TestCase
+class QueryStringQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/FullText/SimpleQueryStringQueryTest.php b/tests/Unit/Query/FullText/SimpleQueryStringQueryTest.php
index 396bd3d9070c7ed6f0cadc99ef8f67b728509654..fd6d10c44e19e92060e2b29849985f070f72f8e5 100644
--- a/tests/Unit/Query/FullText/SimpleQueryStringQueryTest.php
+++ b/tests/Unit/Query/FullText/SimpleQueryStringQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\FullText;
 
 use ONGR\ElasticsearchDSL\Query\FullText\SimpleQueryStringQuery;
 
-class SimpleQueryStringQueryTest extends \PHPUnit_Framework_TestCase
+class SimpleQueryStringQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php b/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php
index 63f292b5eb72980558fe957dce34cdf53c3e0f58..f7bb6ff5a65f91fe198b5457b582f5b814f3cfb6 100644
--- a/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoBoundingBoxQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoBoundingBoxQuery;
 
-class GeoBoundingBoxQueryTest extends \PHPUnit_Framework_TestCase
+class GeoBoundingBoxQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test if exception is thrown when geo points are not set.
diff --git a/tests/Unit/Query/Geo/GeoDistanceQueryTest.php b/tests/Unit/Query/Geo/GeoDistanceQueryTest.php
index 959da1342d8cb1c84b368713e429f43dcf2812ac..b7f416da0c03e67193b27efc2cfd11af6ef88046 100644
--- a/tests/Unit/Query/Geo/GeoDistanceQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoDistanceQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoDistanceQuery;
 
-class GeoDistanceQueryTest extends \PHPUnit_Framework_TestCase
+class GeoDistanceQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray().
diff --git a/tests/Unit/Query/Geo/GeoDistanceRangeQueryTest.php b/tests/Unit/Query/Geo/GeoDistanceRangeQueryTest.php
index 579d1be3acda3219560be5d69c9093d4019bae96..f4a32cc4d4b9427e5daafaa92dfd90497837848d 100644
--- a/tests/Unit/Query/Geo/GeoDistanceRangeQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoDistanceRangeQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoDistanceRangeQuery;
 
-class GeoDistanceRangeQueryTest extends \PHPUnit_Framework_TestCase
+class GeoDistanceRangeQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider to testToArray.
diff --git a/tests/Unit/Query/Geo/GeoPolygonQueryTest.php b/tests/Unit/Query/Geo/GeoPolygonQueryTest.php
index e1c250c55d390090ff009c023c7a76fafc6980af..1edcaf97df8851d5bef6cc500a286c8c7debfff0 100644
--- a/tests/Unit/Query/Geo/GeoPolygonQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoPolygonQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoPolygonQuery;
 
-class GeoPolygonQueryTest extends \PHPUnit_Framework_TestCase
+class GeoPolygonQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider to testToArray.
diff --git a/tests/Unit/Query/Geo/GeoShapeQueryTest.php b/tests/Unit/Query/Geo/GeoShapeQueryTest.php
index 9771144a02d1c76a779e80a5c5873703b48eee91..a0135bf78192b75a62f81449c74ff687e6ac1ec5 100644
--- a/tests/Unit/Query/Geo/GeoShapeQueryTest.php
+++ b/tests/Unit/Query/Geo/GeoShapeQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Geo;
 
 use ONGR\ElasticsearchDSL\Query\Geo\GeoShapeQuery;
 
-class GeoShapeQueryTest extends \PHPUnit_Framework_TestCase
+class GeoShapeQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray() method.
diff --git a/tests/Unit/Query/Joining/HasChildQueryTest.php b/tests/Unit/Query/Joining/HasChildQueryTest.php
index 93dc7d51164de0de2875bce7b062669c73aa903a..147ca6742f73890e4abe35f573532bf13f4ae381 100644
--- a/tests/Unit/Query/Joining/HasChildQueryTest.php
+++ b/tests/Unit/Query/Joining/HasChildQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining;
 
 use ONGR\ElasticsearchDSL\Query\Joining\HasChildQuery;
 
-class HasChildQueryTest extends \PHPUnit_Framework_TestCase
+class HasChildQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests whether __constructor calls setParameters method.
diff --git a/tests/Unit/Query/Joining/HasParentQueryTest.php b/tests/Unit/Query/Joining/HasParentQueryTest.php
index 570246a253e00e74b3cfd424c99f390503147d4e..7601815ef27176da5a72d5e9fd185979514cdc28 100644
--- a/tests/Unit/Query/Joining/HasParentQueryTest.php
+++ b/tests/Unit/Query/Joining/HasParentQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining;
 
 use ONGR\ElasticsearchDSL\Query\Joining\HasParentQuery;
 
-class HasParentQueryTest extends \PHPUnit_Framework_TestCase
+class HasParentQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests whether __constructor calls setParameters method.
diff --git a/tests/Unit/Query/Joining/NestedQueryTest.php b/tests/Unit/Query/Joining/NestedQueryTest.php
index dc273b49a7b2896a4d51aeff89c1d3fad9abacb3..0291e726603edfd591152f7027001cd2791373da 100644
--- a/tests/Unit/Query/Joining/NestedQueryTest.php
+++ b/tests/Unit/Query/Joining/NestedQueryTest.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Joining;
 use ONGR\ElasticsearchDSL\Query\Joining\NestedQuery;
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermsQuery;
 
-class NestedQueryTest extends \PHPUnit_Framework_TestCase
+class NestedQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider to testGetToArray.
diff --git a/tests/Unit/Query/MatchAllQueryTest.php b/tests/Unit/Query/MatchAllQueryTest.php
index f513818f7438f70b5168e56a886691ab04c61106..bab4cc08441cf208a0fa0d8e9640b374dd21c5eb 100644
--- a/tests/Unit/Query/MatchAllQueryTest.php
+++ b/tests/Unit/Query/MatchAllQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query;
 
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
 
-class MatchAllQueryTest extends \PHPUnit_Framework_TestCase
+class MatchAllQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Span/SpanContainingQueryTest.php b/tests/Unit/Query/Span/SpanContainingQueryTest.php
index 2c0c9ba4384a4faba479aaf249344268e5e6266b..71411abf5302bb83db64bd841874c05135c4ed48 100644
--- a/tests/Unit/Query/Span/SpanContainingQueryTest.php
+++ b/tests/Unit/Query/Span/SpanContainingQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanContainingQuery;
 /**
  * Unit test for SpanContainingQuery.
  */
-class SpanContainingQueryTest extends \PHPUnit_Framework_TestCase
+class SpanContainingQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanFirstQueryTest.php b/tests/Unit/Query/Span/SpanFirstQueryTest.php
index d976bf3258da6fcb7df742d2b04b8586fe656d5d..fbff909a61aa695e78c4fc4137b20b1e8708e2c3 100644
--- a/tests/Unit/Query/Span/SpanFirstQueryTest.php
+++ b/tests/Unit/Query/Span/SpanFirstQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanFirstQuery;
 /**
  * Unit test for SpanFirstQuery.
  */
-class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
+class SpanFirstQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanMultiTermQueryTest.php b/tests/Unit/Query/Span/SpanMultiTermQueryTest.php
index 1c18fdaf9d72efa4c9929ea4718ac89697b3caa0..e6f4f803286b7087e8160e596cf997cd2d4a0cb0 100644
--- a/tests/Unit/Query/Span/SpanMultiTermQueryTest.php
+++ b/tests/Unit/Query/Span/SpanMultiTermQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanMultiTermQuery;
 /**
  * Unit test for SpanMultiTermQuery.
  */
-class SpanMultiTermQueryTest extends \PHPUnit_Framework_TestCase
+class SpanMultiTermQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for toArray().
diff --git a/tests/Unit/Query/Span/SpanNearQueryTest.php b/tests/Unit/Query/Span/SpanNearQueryTest.php
index 60f3f8d150230b6cb519f5e1640d1e54652c3584..a71d073378a36db8e9e8d716d51762cc6f0c824e 100644
--- a/tests/Unit/Query/Span/SpanNearQueryTest.php
+++ b/tests/Unit/Query/Span/SpanNearQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanNearQuery;
 /**
  * Unit test for SpanNearQuery.
  */
-class SpanNearQueryTest extends \PHPUnit_Framework_TestCase
+class SpanNearQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanNotQueryTest.php b/tests/Unit/Query/Span/SpanNotQueryTest.php
index 2fef79b084d6ff71afde8cc02d3301e132044514..0fb002f2f3456c2022fa1e74873577fe62360c89 100644
--- a/tests/Unit/Query/Span/SpanNotQueryTest.php
+++ b/tests/Unit/Query/Span/SpanNotQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanNotQuery;
 /**
  * Unit test for SpanNotQuery.
  */
-class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
+class SpanNotQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanOrQueryTest.php b/tests/Unit/Query/Span/SpanOrQueryTest.php
index e7dfab8e2c7c45737b925c3d17245a8afe7088b2..537caf44be953fd3a51bc822d9a23a1aee18485b 100644
--- a/tests/Unit/Query/Span/SpanOrQueryTest.php
+++ b/tests/Unit/Query/Span/SpanOrQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanOrQuery;
 /**
  * Unit test for SpanOrQuery.
  */
-class SpanOrQueryTest extends \PHPUnit_Framework_TestCase
+class SpanOrQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanTermQueryTest.php b/tests/Unit/Query/Span/SpanTermQueryTest.php
index fd6b70fcde526291da6068572f151a5aaf4c7a48..d260a6190883f20ae441120c37f55e286a2e2eff 100644
--- a/tests/Unit/Query/Span/SpanTermQueryTest.php
+++ b/tests/Unit/Query/Span/SpanTermQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanTermQuery;
 /**
  * Unit test for SpanTermQuery.
  */
-class SpanTermQueryTest extends \PHPUnit_Framework_TestCase
+class SpanTermQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Span/SpanWithinQueryTest.php b/tests/Unit/Query/Span/SpanWithinQueryTest.php
index f6e0255ec81c7be85928d7fda77e7f5fe59eae8b..d0a7c1603807cf32a86e15a875907781e517b5af 100644
--- a/tests/Unit/Query/Span/SpanWithinQueryTest.php
+++ b/tests/Unit/Query/Span/SpanWithinQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanWithinQuery;
 /**
  * Unit test for SpanWithinQuery.
  */
-class SpanWithinQueryTest extends \PHPUnit_Framework_TestCase
+class SpanWithinQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests for toArray().
diff --git a/tests/Unit/Query/Specialized/MoreLikeThisQueryTest.php b/tests/Unit/Query/Specialized/MoreLikeThisQueryTest.php
index 44e62dbd77d0b28be2f6ff93e3b54fc20ea7a0ef..557b40ee98195a6b54b9bf38e7c2627fa70074a7 100644
--- a/tests/Unit/Query/Specialized/MoreLikeThisQueryTest.php
+++ b/tests/Unit/Query/Specialized/MoreLikeThisQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized;
 
 use ONGR\ElasticsearchDSL\Query\Specialized\MoreLikeThisQuery;
 
-class MoreLikeThisQueryTest extends \PHPUnit_Framework_TestCase
+class MoreLikeThisQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/Specialized/ScriptQueryTest.php b/tests/Unit/Query/Specialized/ScriptQueryTest.php
index 27c265fee1de426ceb2d6de36d53379c776c131f..7327f159b02f3cd1a27f4010a907f623a0f61c5c 100644
--- a/tests/Unit/Query/Specialized/ScriptQueryTest.php
+++ b/tests/Unit/Query/Specialized/ScriptQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Specialized;
 
 use ONGR\ElasticsearchDSL\Query\Specialized\ScriptQuery;
 
-class ScriptQueryTest extends \PHPUnit_Framework_TestCase
+class ScriptQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Data provider for testToArray().
diff --git a/tests/Unit/Query/Specialized/TemplateQueryTest.php b/tests/Unit/Query/Specialized/TemplateQueryTest.php
index 3ede55e3319bde2a54deea6667a441916cd5a1e4..80e497a5b0fc31c62ba68693e4c6ce7bd6bef8b4 100644
--- a/tests/Unit/Query/Specialized/TemplateQueryTest.php
+++ b/tests/Unit/Query/Specialized/TemplateQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\Specialized\TemplateQuery;
 /**
  * Unit test for Template.
  */
-class TemplateQueryTest extends \PHPUnit_Framework_TestCase
+class TemplateQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray() method with inline.
diff --git a/tests/Unit/Query/TermLevel/ExistsQueryTest.php b/tests/Unit/Query/TermLevel/ExistsQueryTest.php
index 07c739ff562dab4238e1004208718acf614a9a44..9ffd57e0eb3d84274ac79b53c7c373ea72137e62 100644
--- a/tests/Unit/Query/TermLevel/ExistsQueryTest.php
+++ b/tests/Unit/Query/TermLevel/ExistsQueryTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Query\TermLevel\ExistsQuery;
 /**
  * Unit test for ExistsQuery.
  */
-class ExistsQueryTest extends \PHPUnit_Framework_TestCase
+class ExistsQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray() method.
diff --git a/tests/Unit/Query/TermLevel/FuzzyQueryTest.php b/tests/Unit/Query/TermLevel/FuzzyQueryTest.php
index 0433205d75d131a0f56beca9f3ed0a14e0ee1133..8eeb5998b672b6de3ee1d68afc324cdab6aaf541 100644
--- a/tests/Unit/Query/TermLevel/FuzzyQueryTest.php
+++ b/tests/Unit/Query/TermLevel/FuzzyQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\FuzzyQuery;
 
-class FuzzyQueryTest extends \PHPUnit_Framework_TestCase
+class FuzzyQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/IdsQueryTest.php b/tests/Unit/Query/TermLevel/IdsQueryTest.php
index d29c305d8a2b43e6cf16951c2a9920bfc9802bb9..eda356f1f43b1c585143256049b516ee9e032cbf 100644
--- a/tests/Unit/Query/TermLevel/IdsQueryTest.php
+++ b/tests/Unit/Query/TermLevel/IdsQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
 
-class IdsQueryTest extends \PHPUnit_Framework_TestCase
+class IdsQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/PrefixQueryTest.php b/tests/Unit/Query/TermLevel/PrefixQueryTest.php
index caafbbca641e64801fe693465717431071755915..54604b522046e9fa4afd183a6a48b7630bc89b0c 100644
--- a/tests/Unit/Query/TermLevel/PrefixQueryTest.php
+++ b/tests/Unit/Query/TermLevel/PrefixQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\PrefixQuery;
 
-class PrefixQueryTest extends \PHPUnit_Framework_TestCase
+class PrefixQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/RangeQueryTest.php b/tests/Unit/Query/TermLevel/RangeQueryTest.php
index ad6ee1ac469d1208905caefee72e5f8ad3acf5fe..9506b06e3aa9b143be5f4fe3df7ed33426cd3841 100644
--- a/tests/Unit/Query/TermLevel/RangeQueryTest.php
+++ b/tests/Unit/Query/TermLevel/RangeQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\RangeQuery;
 
-class RangeQueryTest extends \PHPUnit_Framework_TestCase
+class RangeQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/RegexpQueryTest.php b/tests/Unit/Query/TermLevel/RegexpQueryTest.php
index 7bc78c6876f9a168b15b40d7a4e21f3c5d6afb31..37035df53c71627a350231de5443de826d6c03eb 100644
--- a/tests/Unit/Query/TermLevel/RegexpQueryTest.php
+++ b/tests/Unit/Query/TermLevel/RegexpQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\RegexpQuery;
 
-class RegexpQueryTest extends \PHPUnit_Framework_TestCase
+class RegexpQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/TermQueryTest.php b/tests/Unit/Query/TermLevel/TermQueryTest.php
index 339938b3e5d22b073a7be34cb35bb63b0937446a..70bb264a820c953fef524701b86e32888e67d986 100644
--- a/tests/Unit/Query/TermLevel/TermQueryTest.php
+++ b/tests/Unit/Query/TermLevel/TermQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 
-class TermQueryTest extends \PHPUnit_Framework_TestCase
+class TermQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/TermsQueryTest.php b/tests/Unit/Query/TermLevel/TermsQueryTest.php
index ba34dc5116e53435a039d173d59bac7ad39bcd27..a7c128e10be16beb17f282736139c1dd472ef342 100644
--- a/tests/Unit/Query/TermLevel/TermsQueryTest.php
+++ b/tests/Unit/Query/TermLevel/TermsQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\TermsQuery;
 
-class TermsQueryTest extends \PHPUnit_Framework_TestCase
+class TermsQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests toArray().
diff --git a/tests/Unit/Query/TermLevel/TypeQueryTest.php b/tests/Unit/Query/TermLevel/TypeQueryTest.php
index 038c6d8d18066994d189504568b891f98c37bfee..6a0cd7f638dbee302b1d5eee84712ad7c5ab18aa 100644
--- a/tests/Unit/Query/TermLevel/TypeQueryTest.php
+++ b/tests/Unit/Query/TermLevel/TypeQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\TypeQuery;
 
-class TypeQueryTest extends \PHPUnit_Framework_TestCase
+class TypeQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for query toArray() method.
diff --git a/tests/Unit/Query/TermLevel/WildcardQueryTest.php b/tests/Unit/Query/TermLevel/WildcardQueryTest.php
index 2dbd1196287fd747210192a05c2bf8a7f79c59b3..cbc951896bbc3ad0404f2aaaa75e9100b2edf261 100644
--- a/tests/Unit/Query/TermLevel/WildcardQueryTest.php
+++ b/tests/Unit/Query/TermLevel/WildcardQueryTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\TermLevel;
 
 use ONGR\ElasticsearchDSL\Query\TermLevel\WildcardQuery;
 
-class WildcardQueryTest extends \PHPUnit_Framework_TestCase
+class WildcardQueryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test for query toArray() method.
diff --git a/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php b/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php
index d08a33425530fd8baabdef8adcdff97f0b6fdbaf..016c1ff7cd71813de081c6c17dc4c23d687647c3 100644
--- a/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/AggregationsEndpointTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\SearchEndpoint\AggregationsEndpoint;
 /**
  * Class AggregationsEndpointTest.
  */
-class AggregationsEndpointTest extends \PHPUnit_Framework_TestCase
+class AggregationsEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php
index c7058e0c0d6f84aadfe517eea9fc38b8abe474ca..5b1a623f8c8c7e59fa1c8c9f10023672a1a13ad8 100644
--- a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php
@@ -19,7 +19,7 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
 /**
  * Class HighlightEndpointTest.
  */
-class HighlightEndpointTest extends \PHPUnit_Framework_TestCase
+class HighlightEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php b/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php
index d3d4519fd496bace1f7f7faf351347f27b0eb4e2..26e2a7a360773b9853fddf494f3c7d89da0d83e8 100644
--- a/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/InnerHitsEndpointTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\SearchEndpoint\InnerHitsEndpoint;
 /**
  * Class AggregationsEndpointTest.
  */
-class InnerHitsEndpointTest extends \PHPUnit_Framework_TestCase
+class InnerHitsEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php
index 4b3b6b8f4175c6b469bf4674e3221149c67a2e41..36adfc3e6e29dff29981472bcfe9783020db9077 100644
--- a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php
@@ -19,7 +19,7 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
 /**
  * Class PostFilterEndpointTest.
  */
-class PostFilterEndpointTest extends \PHPUnit_Framework_TestCase
+class PostFilterEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/QueryEndpointTest.php b/tests/Unit/SearchEndpoint/QueryEndpointTest.php
index 9d4c0d210f0f82463ed30e5f7e7c42e42d5106c9..5d28e152dcaf4476d0318d4fa6c973ef1bdde308 100644
--- a/tests/Unit/SearchEndpoint/QueryEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/QueryEndpointTest.php
@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 /**
  * Unit test class for the QueryEndpoint.
  */
-class QueryEndpointTest extends \PHPUnit_Framework_TestCase
+class QueryEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php
index 7eefe32f5bf7ab10fd795f31d55305a94a220f16..b33028bbdf6758800d49587377287e9e6eb8cc68 100644
--- a/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php
+++ b/tests/Unit/SearchEndpoint/SearchEndpointFactoryTest.php
@@ -17,7 +17,7 @@ use ONGR\ElasticsearchDSL\SearchEndpoint\SearchEndpointFactory;
 /**
  * Unit test class for search endpoint factory.
  */
-class SearchEndpointFactoryTest extends \PHPUnit_Framework_TestCase
+class SearchEndpointFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests get method exception.
diff --git a/tests/Unit/SearchEndpoint/SortEndpointTest.php b/tests/Unit/SearchEndpoint/SortEndpointTest.php
index 42bc7618bc8a852cce46a33e59dd89ea38a78603..7f825bcfd9c438d0e87e9444242108668774d49c 100644
--- a/tests/Unit/SearchEndpoint/SortEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/SortEndpointTest.php
@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 /**
  * Class SortEndpointTest.
  */
-class SortEndpointTest extends \PHPUnit_Framework_TestCase
+class SortEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php
index f71884f4ad158b5b677eef54b282a14489cce228..34c8704ba5b080ddf065d990381d3512cca66658 100644
--- a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php
+++ b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php
@@ -16,7 +16,7 @@ use ONGR\ElasticsearchDSL\Suggest\Suggest;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class SuggestEndpointTest extends \PHPUnit_Framework_TestCase
+class SuggestEndpointTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests constructor.
diff --git a/tests/Unit/SearchTest.php b/tests/Unit/SearchTest.php
index 3d6972b34b51523e9bda8c3874c8334ca5c5c1e5..bfb2f4d3b5df5ec4c64777a52b60db3ccea0adc2 100644
--- a/tests/Unit/SearchTest.php
+++ b/tests/Unit/SearchTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Suggest\Suggest;
 /**
  * Test for Search.
  */
-class SearchTest extends \PHPUnit_Framework_TestCase
+class SearchTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests Search constructor.
diff --git a/tests/Unit/Suggest/SuggestTest.php b/tests/Unit/Suggest/SuggestTest.php
index 626411a08ab0e92e1c6dff8d4f226c334334cfdf..7ae17892bd8131ba4d52b22212bc81a15d8764dd 100644
--- a/tests/Unit/Suggest/SuggestTest.php
+++ b/tests/Unit/Suggest/SuggestTest.php
@@ -13,7 +13,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\Suggest;
 
 use ONGR\ElasticsearchDSL\Suggest\Suggest;
 
-class SuggestTest extends \PHPUnit_Framework_TestCase
+class SuggestTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests getType method.