diff --git a/manifests/repos.pp b/manifests/repos.pp
index fc9e5bbaa..922937e1e 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -21,13 +21,13 @@ class openstack_integration::repos {
         manage_rdo  => false,
         manage_epel => false,
         repo_hash   => {
-          'ocata-puppet-passed-ci' => {
-            'baseurl'  => 'https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/',
-            'descr'    => 'Ocata puppet-passed-ci',
+          'ocata-master'        => {
+            'baseurl'  => 'https://trunk.rdoproject.org/centos7-master/70/8b/708bda51523ac74af7c7d84604af2e0d4444dddb_accb21d7/',
+            'descr'    => 'Ocata master',
             'gpgcheck' => 'no',
             'priority' => 1,
           },
-          'ocata-delorean-deps'    => {
+          'ocata-delorean-deps' => {
             'baseurl'  => 'http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-ocata',
             'descr'    => 'Ocata delorean-deps',
             'gpgcheck' => 'no',
diff --git a/run_tests.sh b/run_tests.sh
index e25cd5629..45c6dce7c 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -221,8 +221,10 @@ echo "TestEncryptedCinderVolumes" >> /tmp/openstack/tempest/test-whitelist.txt
 print_header 'Running Tempest'
 cd /tmp/openstack/tempest
 
-# Until https://review.openstack.org/#/c/389848/ is merged
-git checkout 2866e9fdacbeac5fe98f9e1af78b239de753ce4e
+# Until https://review.openstack.org/#/c/389848/ is packaged in UCA/Ocata
+if uses_debs; then
+    git checkout 2866e9fdacbeac5fe98f9e1af78b239de753ce4e
+fi
 
 virtualenv --system-site-packages run_tempest
 run_tempest/bin/pip install -U .