diff --git a/.kitchen.yml b/.kitchen.yml
index ab210553..fc9dcc1c 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -123,6 +123,18 @@ platforms:
       run_command: "/usr/sbin/init"
       privileged: true
       use_sudo: false
+  - name: centos-8
+    driver_config:
+      image: centos:8
+      provision_command:
+        - yum -y install epel-release
+        - yum -y install ansible iproute python3-jmespath
+      volume:
+        - <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json
+        - /etc # This fixes certain java file actions that check the mount point. Without this adding users fails for some docker storage drivers
+      run_command: "/usr/sbin/init"
+      privileged: true
+      use_sudo: false
   - name: amazonlinux-2
     driver_config:
       image: amazonlinux:2
diff --git a/README.md b/README.md
index aed754ee..a5826c9f 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Ansible role for 7.x/6.x Elasticsearch.  Currently this works on Debian and RedH
 * Debian 9
 * Debian 10
 * CentOS 7
+* CentOS 8
 * Amazon Linux 2
 
 The latest Elasticsearch versions of 7.x & 6.x are actively tested.
diff --git a/test/matrix.yml b/test/matrix.yml
index a0a67f95..877e2598 100644
--- a/test/matrix.yml
+++ b/test/matrix.yml
@@ -9,6 +9,7 @@ OS:
   - debian-9
   - debian-10
   - centos-7
+  - centos-8
   - amazonlinux-2
 TEST_TYPE:
   - oss