diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index 985da44b..f67b2eca 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -180,12 +180,12 @@ root_helper = sudo {{ neutron_bin }}/neutron-rootwrap /etc/neutron/rootwrap.conf
 
 # Messaging service
 [oslo_messaging_rabbit]
-rabbit_port = {{ rabbitmq_port }}
+rabbit_port = {{ neutron_rabbitmq_port }}
 rabbit_userid = {{ neutron_rabbitmq_userid }}
 rabbit_password = {{ neutron_rabbitmq_password }}
 rabbit_virtual_host = {{ neutron_rabbitmq_vhost }}
-rabbit_hosts = {{ rabbitmq_servers }}
-rabbit_use_ssl = {{ rabbitmq_use_ssl }}
+rabbit_hosts = {{ neutron_rabbitmq_servers }}
+rabbit_use_ssl = {{ neutron_rabbitmq_use_ssl }}
 
 # Concurrency (locking mechanisms)
 [oslo_concurrency]
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index ce38fd5a..e31c8bef 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -43,6 +43,9 @@ neutron_provider_networks:
 neutron_rabbitmq_password: secrete
 neutron_rabbitmq_userid: neutron
 neutron_rabbitmq_vhost: /neutron
+neutron_rabbitmq_port: 5671
+neutron_rabbitmq_servers: 10.100.100.2
+neutron_rabbitmq_use_ssl: true
 neutron_requirements_git_install_branch: master
 neutron_service_password: secrete
 neutron_venv_tag: testing