diff --git a/spec/acceptance/basic_nova_spec.rb b/spec/acceptance/basic_nova_spec.rb
index f18dc51cc..8d4c393cb 100644
--- a/spec/acceptance/basic_nova_spec.rb
+++ b/spec/acceptance/basic_nova_spec.rb
@@ -8,21 +8,12 @@ describe 'basic nova' do
       pp= <<-EOS
       Exec { logoutput => 'on_failure' }
 
+      # Common resources
       include ::apt
-      # some packages are not autoupgraded in trusty.
-      # it will be fixed in liberty, but broken in kilo.
-      $need_to_be_upgraded = ['python-tz', 'python-pbr']
-      apt::source { 'trusty-updates-kilo':
-        location          => 'http://ubuntu-cloud.archive.canonical.com/ubuntu/',
-        release           => 'trusty-updates',
-        required_packages => 'ubuntu-cloud-keyring',
-        repos             => 'kilo/main',
-        trusted_source    => true,
-      } ~>
-      exec { '/usr/bin/apt-get -y dist-upgrade':
-        refreshonly => true,
+      class { '::openstack_extras::repo::debian::ubuntu':
+         release         => 'kilo',
+         package_require => true,
       }
-      Apt::Source['trusty-updates-kilo'] -> Package<| |>
 
       class { '::mysql::server': }
 
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index d8b6c669e..b3da96551 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -35,6 +35,7 @@ RSpec.configure do |c|
 
       # install puppet modules from git, use master
       shell('git clone https://git.openstack.org/stackforge/puppet-openstacklib /etc/puppet/modules/openstacklib')
+      shell('git clone https://git.openstack.org/stackforge/puppet-openstack_extras /etc/puppet/modules/openstack_extras')
       shell('git clone https://git.openstack.org/stackforge/puppet-keystone /etc/puppet/modules/keystone')
       shell('git clone https://git.openstack.org/stackforge/puppet-cinder /etc/puppet/modules/cinder')
       shell('git clone https://git.openstack.org/stackforge/puppet-glance /etc/puppet/modules/glance')