diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index 0af3d4a40..e7eb40d7e 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -38,25 +38,34 @@ class openstack_integration::keystone (
     $enable_fernet_setup = false
   }
 
+  # Keystone credential setup is not packaged in UCA yet.
+  # It should be done when Newton is released.
+  if $::operatingsystem == 'CentOS' {
+    $enable_credential_setup = true
+  } else {
+    $enable_credential_setup = false
+  }
+
   class { '::keystone::client': }
   class { '::keystone::cron::token_flush': }
   class { '::keystone::db::mysql':
     password => 'keystone',
   }
   class { '::keystone':
-    debug               => true,
-    database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone',
-    admin_token         => 'a_big_secret',
-    enabled             => true,
-    service_name        => 'httpd',
-    default_domain      => $default_domain,
-    using_domain_config => $using_domain_config,
-    enable_ssl          => $::openstack_integration::config::ssl,
-    public_bind_host    => $::openstack_integration::config::host,
-    admin_bind_host     => $::openstack_integration::config::host,
-    manage_policyrcd    => true,
-    token_provider      => $token_provider,
-    enable_fernet_setup => $enable_fernet_setup,
+    debug                   => true,
+    database_connection     => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone',
+    admin_token             => 'a_big_secret',
+    enabled                 => true,
+    service_name            => 'httpd',
+    default_domain          => $default_domain,
+    using_domain_config     => $using_domain_config,
+    enable_ssl              => $::openstack_integration::config::ssl,
+    public_bind_host        => $::openstack_integration::config::host,
+    admin_bind_host         => $::openstack_integration::config::host,
+    manage_policyrcd        => true,
+    token_provider          => $token_provider,
+    enable_fernet_setup     => $enable_fernet_setup,
+    enable_credential_setup => $enable_credential_setup,
   }
   include ::apache
   class { '::keystone::wsgi::apache':
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 1fa274025..881fa08a0 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -31,7 +31,7 @@ class openstack_integration::repos {
         manage_epel => false,
         repo_hash   => {
           'newton-current'       => {
-            'baseurl'  => 'https://trunk.rdoproject.org/centos7-master/8e/99/8e9986665cd960b47914b969c34e4ea9240c10ba_e74e2f6e/',
+            'baseurl'  => 'https://trunk.rdoproject.org/centos7-master/a1/31/a131f4efa0ab549bfd8d11e13e86d7fa09df3dce_5f3ecf31/',
             'descr'    => 'Newton current',
             'gpgcheck' => 'no',
             'priority' => 1,
diff --git a/run_tests.sh b/run_tests.sh
index 243421e97..8c2d7a535 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -194,7 +194,7 @@ TESTS="${TESTS} gnocchi.tempest"
 TESTS="${TESTS} api.baremetal.admin.test_drivers"
 
 # Zaqar
-TESTS="${TESTS} TestManageQueue"
+TESTS="${TESTS} v2.test_queues.TestManageQueue"
 
 # Cinder encrypted volumes
 # TODO(emilien) re-enable it when those 2 patches are merged: