diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
index b7e92c6a..d2a17f80 100644
--- a/.github/workflows/test-application.yaml
+++ b/.github/workflows/test-application.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
     php:
-        name: 'Run tests with php ${{ matrix.php-version }}'
+        name: 'PHP ${{ matrix.php-version }}, ES ${{ matrix.elasticsearch-version }}'
         runs-on: ubuntu-latest
 
         strategy:
@@ -17,38 +17,56 @@ jobs:
             matrix:
                 include:
                     - php-version: '5.6'
+                      elasticsearch-version: '5.6.14'
                       lint: false
                       symfony-version: '^2.8'
                       elasticsearch-package-constraint: '^5.0'
 
                     - php-version: '7.0'
+                      elasticsearch-version: '5.6.14'
                       lint: false
                       symfony-version: '^3.4'
                       elasticsearch-package-constraint: '^5.0'
 
                     - php-version: '7.2'
+                      elasticsearch-version: '5.6.14'
                       lint: false
                       symfony-version: '^3.4'
                       elasticsearch-package-constraint: '^5.0'
 
                     - php-version: '7.3'
+                      elasticsearch-version: '5.6.14'
                       lint: false
                       symfony-version: '^4.4'
                       elasticsearch-package-constraint: '^5.0'
 
                     - php-version: '7.4'
+                      elasticsearch-version: '5.6.14'
                       lint: true
                       symfony-version: '^5.0'
                       elasticsearch-package-constraint: '^5.0'
 
+                    - php-version: '7.4'
+                      elasticsearch-version: '7.11.1'
+                      lint: true
+                      symfony-version: '^5.0'
+                      elasticsearch-package-constraint: '^5.0'
+
+                    - php-version: '8.0'
+                      elasticsearch-version: '7.11.1'
+                      lint: true
+                      symfony-version: '^5.0'
+                      elasticsearch-package-constraint: '^7.0'
+
         services:
-            elasticsearch5:
-                image: elasticsearch:5.6.14
+            elasticsearch:
+                image: docker.elastic.co/elasticsearch/elasticsearch:${{ matrix.elasticsearch-version }}
                 ports:
                     - 9200:9200
                 env:
                     discovery.type: 'single-node'
                     xpack.security.enabled: 'false'
+                    ES_JAVA_OPTS: '-Xms512m -Xmx512m'
                 options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=5
 
         steps:
diff --git a/Tests/app/config/config_test.yml b/Tests/app/config/config_test.yml
index 9b2d8d9e..c98f3736 100644
--- a/Tests/app/config/config_test.yml
+++ b/Tests/app/config/config_test.yml
@@ -1,4 +1,3 @@
-# Framework Configuration
 framework:
     secret: "SUPER-TOP-SECRET"
     test: ~
diff --git a/composer.json b/composer.json
index 695d0cc9..93de84cc 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^5.6|^7.0",
+        "php": "^5.6|^7.0|^8.0",
         "symfony/framework-bundle": "^2.8|^3.0|^4|^5",
         "symfony/console": "^2.8|^3.0|^4|^5",
         "symfony/stopwatch": "^2.8|^3.0|^4|^5",
@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "mikey179/vfsstream": "~1.4",
-        "squizlabs/php_codesniffer": "~2.0",
+        "squizlabs/php_codesniffer": "^2.0|^3.0",
         "symfony/browser-kit" : "^2.8|^3.4|^4|^5",
         "symfony/expression-language" : "^2.8|^3.4|^4|^5",
         "symfony/twig-bundle": "^2.8|^3.4|^4|^5",