diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py
index 889ac044..9d3e3d89 100644
--- a/hooks/charmhelpers/contrib/openstack/utils.py
+++ b/hooks/charmhelpers/contrib/openstack/utils.py
@@ -212,6 +212,7 @@ GIT_DEFAULT_REPOS = {
     'glance': 'git://github.com/openstack/glance',
     'horizon': 'git://github.com/openstack/horizon',
     'keystone': 'git://github.com/openstack/keystone',
+    'networking-hyperv': 'git://github.com/openstack/networking-hyperv',
     'neutron': 'git://github.com/openstack/neutron',
     'neutron-fwaas': 'git://github.com/openstack/neutron-fwaas',
     'neutron-lbaas': 'git://github.com/openstack/neutron-lbaas',
@@ -761,6 +762,13 @@ def git_default_repos(projects_yaml):
             if service in ['neutron-api', 'neutron-gateway',
                            'neutron-openvswitch']:
                 core_project = 'neutron'
+                if service == 'neutron-api':
+                    repo = {
+                        'name': 'networking-hyperv',
+                        'repository': GIT_DEFAULT_REPOS['networking-hyperv'],
+                        'branch': branch,
+                    }
+                    repos.append(repo)
                 for project in ['neutron-fwaas', 'neutron-lbaas',
                                 'neutron-vpnaas', 'nova']:
                     repo = {
diff --git a/tests/charmhelpers/contrib/amulet/deployment.py b/tests/charmhelpers/contrib/amulet/deployment.py
index 0146236d..9c65518e 100644
--- a/tests/charmhelpers/contrib/amulet/deployment.py
+++ b/tests/charmhelpers/contrib/amulet/deployment.py
@@ -78,11 +78,15 @@ class AmuletDeployment(object):
 
     def _deploy(self):
         """Deploy environment and wait for all hooks to finish executing."""
+        timeout = int(os.environ.get('AMULET_SETUP_TIMEOUT', 900))
         try:
-            self.d.setup(timeout=900)
-            self.d.sentry.wait(timeout=900)
+            self.d.setup(timeout=timeout)
+            self.d.sentry.wait(timeout=timeout)
         except amulet.helpers.TimeoutError:
-            amulet.raise_status(amulet.FAIL, msg="Deployment timed out")
+            amulet.raise_status(
+                amulet.FAIL,
+                msg="Deployment timed out ({}s)".format(timeout)
+            )
         except Exception:
             raise