diff --git a/Gemfile b/Gemfile
index 1fab6085..caddc65d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test, :system_tests do
-  gem 'puppet-openstack_spec_helper',
-      :git     => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
-      :require => false
+  gem 'puppet-openstack_spec_helper', :require => 'false', :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper'
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/bindep.txt b/bindep.txt
index e69de29b..7cdd58e5 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -0,0 +1,11 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see http://docs.openstack.org/infra/bindep/ for additional information.
+
+libxml2-devel [test platform:rpm]
+libxml2-dev [test platform:dpkg]
+libxslt-devel [test platform:rpm]
+libxslt1-dev [test platform:dpkg]
+ruby-devel [test platform:rpm]
+ruby-dev [test platform:dpkg]
+zlib1g-dev [test platform:dpkg]
+zlib-devel [test platform:rpm]
diff --git a/spec/acceptance/basic_glance_spec.rb b/spec/acceptance/basic_glance_spec.rb
index 0410b5bb..e361298d 100644
--- a/spec/acceptance/basic_glance_spec.rb
+++ b/spec/acceptance/basic_glance_spec.rb
@@ -27,13 +27,8 @@ describe 'glance class' do
       class { '::glance::api':
         debug               => true,
         database_connection => 'mysql+pymysql://glance:a_big_secret@127.0.0.1/glance?charset=utf8',
-      }
-      class { '::glance::registry::authtoken':
-        password => 'a_big_secret',
-      }
-      class { '::glance::registry':
-        debug               => true,
-        database_connection => 'mysql+pymysql://glance:a_big_secret@127.0.0.1/glance?charset=utf8',
+        enable_v1_api       => false,
+        enable_v2_api       => true,
       }
 
       glance_image { 'test_image':
diff --git a/tox.ini b/tox.ini
index aea06c84..cd122cbf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,9 @@ minversion = 1.6
 skipsdist = True
 envlist = releasenotes
 
+[testenv]
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+
 [testenv:releasenotes]
 deps = -rtest-requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html