diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf
index ebdbdf36..6c14454e 100644
--- a/templates/icehouse/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -9,7 +9,7 @@ lock_path = /var/lock/neutron
 core_plugin = {{ core_plugin }} 
 {% include "parts/rabbitmq" %}
 control_exchange = neutron
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 {% if network_device_mtu -%}
 network_device_mtu = {{ network_device_mtu }}
 {% endif -%}
diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf
index dc07dc3e..3d4772a4 100644
--- a/templates/kilo/neutron.conf
+++ b/templates/kilo/neutron.conf
@@ -8,7 +8,7 @@ verbose = {{ verbose }}
 debug = {{ debug }}
 core_plugin = {{ core_plugin }}
 control_exchange = neutron
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 {% if network_device_mtu -%}
 network_device_mtu = {{ network_device_mtu }}
 {% endif -%}
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 945407e7..888700d3 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -609,8 +609,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
                 'debug': 'False',
                 'core_plugin': 'ml2',
                 'control_exchange': 'neutron',
-                'notification_driver': 'neutron.openstack.common.notifier.'
-                                       'rpc_notifier',
+                'notification_driver': 'messaging',
             },
             'agent': {
                 'root_helper': 'sudo /usr/bin/neutron-rootwrap '