diff --git a/README.md b/README.md
index b9d47546f..a6729e519 100644
--- a/README.md
+++ b/README.md
@@ -391,11 +391,11 @@ The MySQL module has an example task that allows a user to execute arbitary SQL
 This module has been tested on:
 
 * RedHat Enterprise Linux 5, 6, 7
-* Debian 6, 7, 8
+* Debian 8, 9
 * CentOS 5, 6, 7
-* Ubuntu 10.04, 12.04, 14.04, 16.04
-* Scientific Linux 5, 6
-* SLES 11
+* Ubuntu 14.04, 16.04, 18.04
+* Scientific Linux 6, 7
+* SLES 11 SPI, 12
 
 Testing on other platforms has been minimal and cannot be guaranteed.
 
diff --git a/metadata.json b/metadata.json
index 44e0c334b..28288daa7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -71,7 +71,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     }
   ],
diff --git a/spec/acceptance/types/mysql_plugin_spec.rb b/spec/acceptance/types/mysql_plugin_spec.rb
index b9b545cfa..327e02299 100644
--- a/spec/acceptance/types/mysql_plugin_spec.rb
+++ b/spec/acceptance/types/mysql_plugin_spec.rb
@@ -16,7 +16,7 @@
   end
 elsif fact('osfamily') =~ %r{Debian}
   if fact('operatingsystem') =~ %r{Ubuntu}
-    if fact('operatingsystemrelease') =~ %r{^16\.04}
+    if fact('operatingsystemrelease') =~ %r{^16\.04|^18\.04}
       # On Xenial running 5.7.12, the example plugin does not appear to be available.
       plugin = 'validate_password'
       plugin_lib = 'validate_password.so'