diff --git a/defaults/main.yml b/defaults/main.yml
index a03355f..f3b6085 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -135,6 +135,7 @@ mariadb_key_ids: ['0xcbcb082a1bb943db', '0xf1656f24c74cd1d8']
 # Galera
 # -------------------------------------
 mariadb_galera_resetup: false
+mariadb_wsrep_node_address: false # Set primary node IP 
 mariadb_galera_members: []
 mariadb_galera_primary_node: 'change_me' # See: https://github.com/ansible/ansible/issues/17453
 mariadb_wsrep_stt_method: 'rsync'
diff --git a/tests/test.yml b/tests/test.yml
index 0ab7720..57b1395 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -76,12 +76,7 @@
 - hosts: galera
   vars:
     mariadb_galera_primary_node: '{% if is_docker %}docker-{% else %}vbox-{% endif %}{{ ansible_distribution_release }}-upstream-galera-1'
-    mariadb_wsrep_node_address: "{{ ansible_all_ipv4_addresses[0] }}"
+    mariadb_wsrep_node_address: "{{ '127.0.0.1' if is_docker else ansible_eth1.ipv4.address }}"
     mariadb_version: '10.1'
-  pre_tasks:
-    - set_fact:
-        mariadb_wsrep_node_address: "{{ ansible_eth1.ipv4.address }}"
-      when: not is_docker
   roles:
     - ../../
-