diff --git a/stable/wordpress/README.md b/stable/wordpress/README.md
index 520ae18747..e880465ce3 100644
--- a/stable/wordpress/README.md
+++ b/stable/wordpress/README.md
@@ -63,12 +63,11 @@ The following tables lists the configurable parameters of the WordPress chart an
 | `smtpUsername`                       | User name for SMTP emails                  | `nil`                                                      |
 | `smtpProtocol`                       | SMTP protocol [`tls`, `ssl`]               | `nil`                                                      |
 | `mariadb.enabled`                    | Deploy MariaDB container(s)                | `true`                                                     |
-| `mariadb.mariadbHostname`            | MariaDB Hostname if deployMariadb is false | `nil`                                                      |
 | `mariadb.mariadbRootPassword`        | MariaDB admin password                     | `nil`                                                      |
 | `mariadb.mariadbDatabase`            | Database name to create                    | `bitnami_wordpress`                                        |
 | `mariadb.mariadbUser`                | Database user to create                    | `bn_wordpress`                                             |
 | `mariadb.mariadbPassword`            | Password for the database                  | _random 10 character long alphanumeric string_             |
-| `externalDatabase.hostname`          | Host of the external database              | `localhost`                                                      |
+| `externalDatabase.hostname`          | Host of the external database              | `localhost`                                                |
 | `externalDatabase.rootPassword`      | DB Root users password (schema creation)   | `nil`                                                    |
 | `externalDatabase.username`          | Existing username in the external db       | `bn_wordpress`                                             |
 | `externalDatabase.password`          | Password for the above username            | `nil`                                                      |
diff --git a/stable/wordpress/templates/tests/test-mariadb-connection.yaml b/stable/wordpress/templates/tests/test-mariadb-connection.yaml
index 608b5831a7..3607df001e 100644
--- a/stable/wordpress/templates/tests/test-mariadb-connection.yaml
+++ b/stable/wordpress/templates/tests/test-mariadb-connection.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.mariadb.enabled }}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -10,11 +11,7 @@ spec:
     image: {{ .Values.image }}
     env:
       - name: MARIADB_HOST
-{{- if .Values.deployMariadb }}
         value: {{ template "mariadb.fullname" . }}
-{{- else }}
-        value: {{ default "" .Values.mariadb.mariadbHostname | quote }}
-{{- end }}
       - name: MARIADB_PORT
         value: "3306"
       - name: WORDPRESS_DATABASE_NAME
@@ -28,4 +25,4 @@ spec:
             key: mariadb-password
     command: ["sh", "-c", "mysql --host=$MARIADB_HOST --port=$MARIADB_PORT --user=$WORDPRESS_DATABASE_USER --password=$WORDPRESS_DATABASE_PASSWORD"]
   restartPolicy: Never
-
+{{- end }}
diff --git a/stable/wordpress/values.yaml b/stable/wordpress/values.yaml
index 682df61915..2e7b9681e8 100644
--- a/stable/wordpress/values.yaml
+++ b/stable/wordpress/values.yaml
@@ -80,10 +80,6 @@ mariadb:
   ## If you want to use an external database set this to false and supply details to externalDatabase above
   enabled: true
 
-  ## MariaDB Hostname
-  ## If you would prefer to use a preexisting database host setdeployMariadb to false and then enter the hostname below
-  # mariadbHostname:
-
   ## MariaDB admin password
   ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run
   ##