diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf
new file mode 100644
index 00000000..5371530b
--- /dev/null
+++ b/templates/mitaka/nova.conf
@@ -0,0 +1,34 @@
+# mitaka
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+logdir=/var/log/nova
+state_path=/var/lib/nova
+root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
+verbose= {{ verbose }}
+use_syslog = {{ use_syslog }}
+api_paste_config=/etc/nova/api-paste.ini
+enabled_apis=metadata
+multi_host=True
+# Access to neutron API services
+network_api_class=nova.network.neutronv2.api.API
+
+{% include "section-zeromq" %}
+
+[neutron]
+url={{ quantum_url }}
+auth_plugin=password
+project_name={{ service_tenant }}
+username={{ service_username }}
+password={{ service_password }}
+auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}
+region={{ region }}
+service_metadata_proxy=True
+metadata_proxy_shared_secret={{ shared_secret }}
+
+{% include "section-rabbitmq-oslo" %}
+
+[oslo_concurrency]
+lock_path=/var/lock/nova
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 9aafdad7..caf79c57 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -193,6 +193,10 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
                             'nova-scheduler',
                             'nova-conductor']
 
+        if self._get_openstack_release_string() >= 'liberty':
+            nova_cc_services.remove('nova-api-ec2')
+            nova_cc_services.remove('nova-objectstore')
+
         commands = {
             self.mysql_sentry: ['mysql'],
             self.keystone_sentry: ['keystone'],
@@ -874,16 +878,29 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
             expected['oslo_concurrency'] = {
                 'lock_path': '/var/lock/nova'
             }
-            expected['neutron'] = {
-                'auth_strategy': 'keystone',
-                'url': nova_cc_relation['quantum_url'],
-                'admin_tenant_name': 'services',
-                'admin_username': 'nova',
-                'admin_password': nova_cc_relation['service_password'],
-                'admin_auth_url': ep,
-                'service_metadata_proxy': 'True',
-                'metadata_proxy_shared_secret': u.not_null
-            }
+            if self._get_openstack_release() >= self.trusty_mitaka:
+                expected['neutron'] = {
+                    'url': nova_cc_relation['quantum_url'],
+                    'auth_plugin': 'password',
+                    'project_name': 'services',
+                    'username': 'nova',
+                    'password': nova_cc_relation['service_password'],
+                    'auth_url': ep.split('/v')[0],
+                    'region': 'RegionOne',
+                    'service_metadata_proxy': 'True',
+                    'metadata_proxy_shared_secret': u.not_null
+                }
+            else:
+                expected['neutron'] = {
+                    'auth_strategy': 'keystone',
+                    'url': nova_cc_relation['quantum_url'],
+                    'admin_tenant_name': 'services',
+                    'admin_username': 'nova',
+                    'admin_password': nova_cc_relation['service_password'],
+                    'admin_auth_url': ep,
+                    'service_metadata_proxy': 'True',
+                    'metadata_proxy_shared_secret': u.not_null
+                }
         else:
             # Juno or earlier
             expected['DEFAULT'].update({