diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml
index c168c2f64..46cc19db5 100644
--- a/.ci/jobs/defaults.yml
+++ b/.ci/jobs/defaults.yml
@@ -69,6 +69,6 @@
     publishers:
     - email:
         recipients: infra-root+build@elastic.co
-    # - junit:
-    #     results: "*-junit.xml"
-    #     allow-empty-results: true
+    - junit:
+        results: "tests/*-junit.xml"
+        allow-empty-results: true
diff --git a/.ci/jobs/elastic+elasticsearch-php+7.7.yml b/.ci/jobs/elastic+elasticsearch-php+7.7.yml
new file mode 100644
index 000000000..fea9fa24d
--- /dev/null
+++ b/.ci/jobs/elastic+elasticsearch-php+7.7.yml
@@ -0,0 +1,14 @@
+---
+- job:
+    name: elastic+elasticsearch-php+7.7
+    display-name: 'elastic / elasticsearch-php # 7.7'
+    description: Testing the elasticsearch-php 7.7 branch.
+    parameters:
+    - string:
+        name: branch_specifier
+        default: refs/heads/7.7
+        description: the Git branch specifier to build (<branchName>, <tagName>,
+          <commitId>, etc.)
+    triggers:
+    - github
+    - timed: '@daily'
diff --git a/.ci/jobs/elastic+elasticsearch-php+7.x.yml b/.ci/jobs/elastic+elasticsearch-php+7.x.yml
index 7c6838ebf..77afcea12 100644
--- a/.ci/jobs/elastic+elasticsearch-php+7.x.yml
+++ b/.ci/jobs/elastic+elasticsearch-php+7.x.yml
@@ -11,4 +11,4 @@
           <commitId>, etc.)
     triggers:
     - github
-    - timed: '@weekly'
+    - timed: '@daily'
diff --git a/.ci/jobs/elastic+elasticsearch-php+pull-request.yml b/.ci/jobs/elastic+elasticsearch-php+pull-request.yml
index 24c6754d4..abf3e861d 100644
--- a/.ci/jobs/elastic+elasticsearch-php+pull-request.yml
+++ b/.ci/jobs/elastic+elasticsearch-php+pull-request.yml
@@ -3,6 +3,7 @@
     name: elastic+elasticsearch-php+pull-request
     display-name: 'elastic / elasticsearch-php # pull-request'
     description: Testing of elasticsearch-php pull requests.
+    junit_results: "tests/*-junit.xml"
     scm:
     - git:
         branches:
@@ -16,4 +17,3 @@
         github-hooks: true
         status-context: clients-ci
         cancel-builds-on-update: true
-    publishers: []
diff --git a/.ci/run-repository.sh b/.ci/run-repository.sh
index 18697a062..9a2bf4d4c 100644
--- a/.ci/run-repository.sh
+++ b/.ci/run-repository.sh
@@ -35,6 +35,7 @@ repo=$(realpath $(dirname $(realpath -s $0))/../)
 docker run \
   --network=${network_name} \
   --workdir="/usr/src/app" \
+  --volume=${repo}/tests:/usr/src/app/tests \
   --env STACK_VERSION=${STACK_VERSION} \
   --env TEST_SUITE=${TEST_SUITE} \
   --env PHP_VERSION=${PHP_VERSION} \
diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml
index eacdb33ed..e1af5a153 100644
--- a/.ci/test-matrix.yml
+++ b/.ci/test-matrix.yml
@@ -1,6 +1,6 @@
 ---
 STACK_VERSION:
-  - 7.6-SNAPSHOT
+  - 7.x-SNAPSHOT
 
 PHP_VERSION:
   - 7.4-cli
diff --git a/.gitignore b/.gitignore
index e417b7294..dff608834 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,6 @@ util/cache/
 
 # Code coverage
 build
+
+# Junit test output
+tests/*-junit.xml
diff --git a/.travis.yml b/.travis.yml
index 8fbe322db..9fe78c8ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ jobs:
 
 env:
   global:
-    - STACK_VERSION="7.7.0-SNAPSHOT"
+    - STACK_VERSION="7.x-SNAPSHOT"
 
 before_install:
   - ./travis/run_es_docker.sh
diff --git a/phpunit-integration.xml b/phpunit-integration.xml
index 20275c13a..692554edf 100644
--- a/phpunit-integration.xml
+++ b/phpunit-integration.xml
@@ -23,4 +23,7 @@
             <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
+    <logging>
+        <log type="junit" target="tests/yaml-test-junit.xml"/>
+    </logging>
 </phpunit>
diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php
index f4d90415b..de43a3134 100644
--- a/tests/Elasticsearch/Tests/YamlRunnerTest.php
+++ b/tests/Elasticsearch/Tests/YamlRunnerTest.php
@@ -832,9 +832,6 @@ public function yamlProvider(): array
         $finder->files();
         $finder->name('*.yml');
 
-        // *.yaml files should be included until the library is ES 6.0+ only
-        //$finder->name('*.yaml');
-
         $filter = getenv('TEST_CASE') !== false ? getenv('TEST_CASE') : null;
 
         /**