diff --git a/hooks/neutron_utils.py b/hooks/neutron_utils.py
index d4418b7c..388a1749 100644
--- a/hooks/neutron_utils.py
+++ b/hooks/neutron_utils.py
@@ -222,7 +222,8 @@ def get_packages():
     cmp_os_source = CompareOpenStackReleases(os_release('neutron-common'))
     cmp_host_release = CompareHostReleases(lsb_release()['DISTRIB_CODENAME'])
     if plugin == OVS:
-        if cmp_os_source >= 'icehouse' and cmp_host_release < 'utopic':
+        if (cmp_os_source >= 'icehouse' and cmp_os_source < 'mitaka' and
+                cmp_host_release < 'utopic'):
             # NOTE(jamespage) neutron-vpn-agent supercedes l3-agent for
             # icehouse but openswan was removed in utopic.
             packages.remove('neutron-l3-agent')
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index e1e79481..c48f4ac9 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -180,6 +180,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
         if self._get_openstack_release() <= self.trusty_icehouse:
             neutron_services.append('neutron-vpn-agent')
         if self._get_openstack_release() >= self.trusty_mitaka:
+            neutron_services.append('neutron-l3-agent')
             # neutron-plugin-openvswitch-agent -> neutron-openvswitch-agent
             neutron_services.remove('neutron-plugin-openvswitch-agent')
             neutron_services.append('neutron-openvswitch-agent')