diff --git a/defaults/main.yml b/defaults/main.yml
index 9f2a4e8..e29113a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -66,7 +66,10 @@ galaxy_server_dir: /mnt/galaxy/galaxy-app
 galaxy_venv_dir: "{{ galaxy_server_dir }}/.venv"
 
 # A system path for Galaxy's main configuration file
-galaxy_config_file: "{{ galaxy_server_dir }}/config/galaxy.ini"
+# Galaxy config file can either be 'ini-paste' (old style) or 'yaml'
+galaxy_config_style: "ini-paste"
+galaxy_config_file_basename: "galaxy.{{ 'yml' if galaxy_config_style in ('yaml', 'yml') else 'ini' }}"
+galaxy_config_file: "{{ galaxy_server_dir }}/config/{{ galaxy_config_file_basename }}"
 
 ## Set this to 'yes' if you are targeting galaxy in a docker container
 galaxy_runs_in_docker: no
diff --git a/tests/test_playbook.yml b/tests/test_playbook.yml
index 6776ace..7584b52 100644
--- a/tests/test_playbook.yml
+++ b/tests/test_playbook.yml
@@ -7,7 +7,6 @@
       galaxy_tools_data_managers_list: files/run_data_managers.yaml
       galaxy_tools_galaxy_instance_url: http://localhost:8080/
       galaxy_tools_install_data_managers: yes
-      galaxy_config_style: "ini-paste"
   pre_tasks:
     - name: Make sure Galaxy is ready before running tests
       uri: url="http://localhost:8080/" state=present