diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml
index f9ffa4e..86502fc 100644
--- a/roles/confluence_config/defaults/main.yml
+++ b/roles/confluence_config/defaults/main.yml
@@ -9,6 +9,7 @@ atl_db_idletestperiod: "{{ lookup('env', 'ATL_DB_IDLETESTPERIOD') or '100' }}"
atl_db_maxstatements: "{{ lookup('env', 'ATL_DB_MAXSTATEMENTS') or '0' }}"
atl_db_validate: "{{ lookup('env', 'ATL_DB_VALIDATE') or 'false' }}"
atl_db_acquireincrement: "{{ lookup('env', 'ATL_DB_ACQUIREINCREMENT') or '1' }}"
+atl_db_preferredtestquery: "{{ lookup('env', 'ATL_DB_PREFERREDTESTQUERY') or 'select version();' }}"
atl_hazelcast_network_aws_tag_key: "Cluster"
atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com"
diff --git a/roles/confluence_config/molecule/default/playbook.yml b/roles/confluence_config/molecule/default/playbook.yml
index 89f5a68..f8b8b43 100644
--- a/roles/confluence_config/molecule/default/playbook.yml
+++ b/roles/confluence_config/molecule/default/playbook.yml
@@ -18,6 +18,7 @@
atl_tomcat_scheme: "http"
atl_proxy_name: "localhost"
atl_proxy_port: "80"
+ atl_db_preferredtestquery: "select 1;"
roles:
- role: linux_common
diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py
index 713be57..39e69c5 100644
--- a/roles/confluence_config/molecule/default/tests/test_default.py
+++ b/roles/confluence_config/molecule/default/tests/test_default.py
@@ -77,4 +77,5 @@ def test_confluence_config_file(host):
assert f.contains('org.postgresql.Driver')
assert f.contains('ec2.amazonaws.com')
assert f.contains('jdbc:postgresql://postgres-db.ap-southeast-2.rds.amazonaws.com:5432/confluence')
- assert f.contains('molecule_password')
\ No newline at end of file
+ assert f.contains('molecule_password')
+ assert f.contains('select 1;')
\ No newline at end of file
diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index b6e78ba..d0689d2 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -24,7 +24,7 @@
{{ atl_db_maxstatements }}
{{ atl_db_validate }}
{{ atl_db_acquireincrement }}
- select version();
+ {{ atl_db_preferredtestquery }}
{{ atl_product_home_shared }}
true