diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index fae7fdeef..64d63b35a 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -67,6 +67,19 @@ class openstack_integration::keystone (
     ssl_cert        => $::openstack_integration::params::cert_path,
     workers         => 2,
   }
+  # Workaround to purge Keystone vhost that is provided & activated by default with running
+  # Canonical packaging (called 'keystone').
+  if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
+    ensure_resource('file', '/etc/apache2/sites-available/keystone.conf', {
+      'ensure'  => 'absent',
+    })
+    ensure_resource('file', '/etc/apache2/sites-enabled/keystone.conf', {
+      'ensure'  => 'absent',
+    })
+
+    Package['keystone'] -> File['/etc/apache2/sites-available/keystone.conf']
+    -> File['/etc/apache2/sites-enabled/keystone.conf'] ~> Anchor['keystone::install::end']
+  }
   class { '::keystone::roles::admin':
     email    => 'test@example.tld',
     password => 'a_big_secret',
diff --git a/manifests/repos.pp b/manifests/repos.pp
index f127de764..c82d3816f 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -9,6 +9,12 @@ class openstack_integration::repos {
           release         => 'mitaka',
           package_require => true,
         }
+      } else {
+        class { '::openstack_extras::repo::debian::ubuntu':
+          release         => 'newton',
+          repo            => 'updates',
+          package_require => true,
+        }
       }
       # Ceph is both packaged on UCA & ceph.com
       # Official packages are on ceph.com so we want to make sure
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index 6ce5e68a0..55ce71691 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -76,6 +76,14 @@ class openstack_integration::tempest (
   include ::openstack_integration::config
   include ::openstack_integration::params
 
+  # Install missed dependency for neutron tests
+  # https://github.com/openstack/neutron/blob/master/test-requirements.txt#L20
+  if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
+    package { ['python-ddt', 'python-oslotest']:
+      ensure => present
+    }
+  }
+
   class { '::tempest':
     debug                  => true,
     use_stderr             => false,